@tsofist/schema-forge 3.3.2 → 3.4.1
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.
|
@@ -33,7 +33,7 @@ export declare const DBMLIndexTypeList: readonly ["btree", "hash", "gin", "gist"
|
|
|
33
33
|
/**
|
|
34
34
|
* Database column type list.
|
|
35
35
|
*/
|
|
36
|
-
export declare const DBMLColumnTypeList: readonly ["integer", "bigint", "smallint", "numeric", "numeric(12,2)", "numeric(15,2)", "numeric(30,18)", "float", "float8", "boolean", "text", "date", "time", "timestamp", "timestamptz", "integer[]", "bigint[]", "smallint[]", "numeric[]", "numeric(12,2)[]", "numeric(15,2)[]", "numeric(30,18)[]", "float[]", "float8[]", "boolean[]", "text[]", "date[]", "time[]", "timestamp[]", "timestamptz[]"];
|
|
36
|
+
export declare const DBMLColumnTypeList: readonly ["uuid", "integer", "bigint", "smallint", "numeric", "numeric(12,2)", "numeric(15,2)", "numeric(30,18)", "float", "float8", "boolean", "text", "date", "time", "timestamp", "timestamptz", "uuid[]", "integer[]", "bigint[]", "smallint[]", "numeric[]", "numeric(12,2)[]", "numeric(15,2)[]", "numeric(30,18)[]", "float[]", "float8[]", "boolean[]", "text[]", "date[]", "time[]", "timestamp[]", "timestamptz[]"];
|
|
37
37
|
/**
|
|
38
38
|
* Table column type.
|
|
39
39
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/dbml-generator/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AAE5E;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,2BAA2B,EAAE,CAAC;IAC3C,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC,IAAI,CAAC,EAAE,eAAe,CAAC;IAIvB,YAAY,CAAC,EAAE,OAAO,CAAC;CAc1B;AAED;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,6DAQpB,CAAC;AAEX;;GAEG;AACH,eAAO,MAAM,kBAAkB,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/dbml-generator/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AAE5E;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,2BAA2B,EAAE,CAAC;IAC3C,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC,IAAI,CAAC,EAAE,eAAe,CAAC;IAIvB,YAAY,CAAC,EAAE,OAAO,CAAC;CAc1B;AAED;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,6DAQpB,CAAC;AAEX;;GAEG;AACH,eAAO,MAAM,kBAAkB,+ZAkCrB,CAAC;AAEX;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEjE;;;;;GAKG;AACH,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;AAE/D;;;;GAIG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC3B;;;OAGG;IACH,IAAI,CAAC,EAAE,aAAa,CAAC;IACrB;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,EAAE,CAAC,EAAE,OAAO,CAAC;IACb;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,mBAAmB,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,IAAI,QAAQ,CACnE,gBAAgB,GAAG,MAAM,GAAG,CAAC,CAChC,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,iBAAiB,GAAG;IAC5B;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;;;OAMG;IACH,OAAO,CAAC,EAAE;QACN,CAAC,KAAK,EAAE,MAAM,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;KAC9C,CAAC;IACF;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,QAAQ,CAAC,EAAE;QAAE,WAAW,EAAE,SAAS,CAAA;KAAE,CAAC;CACzC,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,iBAAiB,GAAG,MAAM,CAAC;AAE9D,MAAM,MAAM,iBAAiB,GAAG;IAC5B;;;;OAIG;IACH,EAAE,CAAC,EAAE,OAAO,CAAC;IACb;;;;OAIG;IACH,IAAI,CAAC,EAAE,cAAc,CAAC;CACzB,CAAC"}
|
|
@@ -19,6 +19,7 @@ exports.DBMLIndexTypeList = [
|
|
|
19
19
|
* Database column type list.
|
|
20
20
|
*/
|
|
21
21
|
exports.DBMLColumnTypeList = [
|
|
22
|
+
'uuid',
|
|
22
23
|
'integer',
|
|
23
24
|
'bigint',
|
|
24
25
|
'smallint',
|
|
@@ -35,6 +36,7 @@ exports.DBMLColumnTypeList = [
|
|
|
35
36
|
'timestamp',
|
|
36
37
|
'timestamptz',
|
|
37
38
|
//
|
|
39
|
+
'uuid[]',
|
|
38
40
|
'integer[]',
|
|
39
41
|
'bigint[]',
|
|
40
42
|
'smallint[]',
|
|
@@ -25,8 +25,8 @@ function dereferenceSchema(raw, options = {}) {
|
|
|
25
25
|
}
|
|
26
26
|
// $ref
|
|
27
27
|
if ('$ref' in current && typeof current.$ref === 'string') {
|
|
28
|
-
const
|
|
29
|
-
if (
|
|
28
|
+
const resolvedSchema = resolveRef(cache, schema, current.$ref);
|
|
29
|
+
if (resolvedSchema == null) {
|
|
30
30
|
const replacement = onDereferenceFailure && !throwOnDereferenceFailure
|
|
31
31
|
? onDereferenceFailure(current.$ref, current, schema)
|
|
32
32
|
: undefined;
|
|
@@ -38,18 +38,22 @@ function dereferenceSchema(raw, options = {}) {
|
|
|
38
38
|
}
|
|
39
39
|
return replacement;
|
|
40
40
|
}
|
|
41
|
-
if (seen.has(
|
|
42
|
-
return seen.get(
|
|
43
|
-
if (Array.isArray(
|
|
44
|
-
const resolvedArray = resolve(
|
|
45
|
-
seen.set(
|
|
41
|
+
if (seen.has(resolvedSchema))
|
|
42
|
+
return seen.get(resolvedSchema);
|
|
43
|
+
if (Array.isArray(resolvedSchema)) {
|
|
44
|
+
const resolvedArray = resolve(resolvedSchema, current.$ref);
|
|
45
|
+
seen.set(resolvedSchema, resolvedArray);
|
|
46
46
|
return resolvedArray;
|
|
47
47
|
}
|
|
48
48
|
const placeholder = {};
|
|
49
49
|
seen.set(current, placeholder);
|
|
50
|
-
const
|
|
51
|
-
|
|
52
|
-
|
|
50
|
+
const result = {
|
|
51
|
+
...resolvedSchema,
|
|
52
|
+
...resolve(resolvedSchema, current.$ref),
|
|
53
|
+
};
|
|
54
|
+
Object.assign(placeholder, result);
|
|
55
|
+
seen.set(resolvedSchema, result);
|
|
56
|
+
return result;
|
|
53
57
|
}
|
|
54
58
|
// Objects
|
|
55
59
|
const obj = Object.fromEntries(Object.entries(current).map(([key, value]) => [
|