@antelopejs/dms-database 0.4.1 → 0.4.3
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/README.md +34 -11
- package/dist/service/browse.js +34 -5
- package/dist/service/browse.js.map +1 -1
- package/dist/service/declaredFields.d.ts +14 -0
- package/dist/service/declaredFields.js +106 -0
- package/dist/service/declaredFields.js.map +1 -0
- package/dist/service/introspect.js +19 -75
- package/dist/service/introspect.js.map +1 -1
- package/dist/service/queryInspection.js +1 -1
- package/dist/service/queryInspection.js.map +1 -1
- package/frontend-vue/app/build/diagram/graphModel.ts +4 -5
- package/frontend-vue/app/build/diagram/layout.ts +8 -7
- package/frontend-vue/app/build/diagram/packing.ts +0 -24
- package/frontend-vue/app/build/utils/fieldTypes.ts +18 -4
- package/frontend-vue/app/components/ConnectionStatus.vue +1 -1
- package/frontend-vue/app/components/DiagramTableNode.vue +2 -4
- package/frontend-vue/app/components/JsonCellPanel.vue +3 -1
- package/frontend-vue/app/components/QueryConsole.vue +11 -64
- package/frontend-vue/app/components/QueryResultPanel.vue +2 -17
- package/frontend-vue/app/components/SchemaDiagram.vue +12 -4
- package/frontend-vue/app/components/TableInspector.vue +2 -2
- package/frontend-vue/i18n/locales/database-en-GB.json +1 -4
- package/frontend-vue/i18n/locales/database-fr-FR.json +1 -4
- package/frontend-vue/package.json +1 -1
- package/frontend-vue/pnpm-lock.yaml +5 -5
- package/frontend-vue/tests/connectionStatus.test.ts +36 -0
- package/frontend-vue/tests/dataBrowser.test.ts +31 -1
- package/frontend-vue/tests/diagramLayout.test.ts +75 -41
- package/frontend-vue/tests/queryResultPanel.test.ts +38 -0
- package/frontend-vue/tests/serverRender.test.ts +31 -1
- package/frontend-vue/vitest.config.ts +9 -1
- package/package.json +7 -7
- package/skills/dms-database/SKILL.md +1 -1
package/README.md
CHANGED
|
@@ -1,17 +1,18 @@
|
|
|
1
|
+
<a href="https://github.com/AntelopeJS/dms"><img data-illustration src="./.github/readme/strip.svg" width="100%" alt="DMS DATABASE CONSOLE: part of AntelopeJS DMS, the open-source back office. A glowing button reads Star AntelopeJS DMS."></a>
|
|
2
|
+
|
|
1
3
|
<div align="center">
|
|
2
4
|
|
|
3
|
-
#
|
|
5
|
+
# `@antelopejs/dms-database`
|
|
6
|
+
|
|
7
|
+
<a href="https://www.npmjs.com/package/@antelopejs/dms-database"><img alt="npm" src="https://img.shields.io/npm/v/@antelopejs/dms-database?style=for-the-badge&labelColor=000000&color=000000" data-illustration></a> <a href="./LICENSE"><img alt="License" src="https://img.shields.io/npm/l/@antelopejs/dms-database?style=for-the-badge&labelColor=000000&color=000000" data-illustration></a> <a href="https://discord.gg/g4pFt6eXqu"><img alt="Discord" src="https://img.shields.io/badge/Discord-18181B?logo=discord&style=for-the-badge&color=000000" data-illustration></a> <a href="https://dms.antelopejs.com/docs/modules/database"><img alt="Documentation" src="https://img.shields.io/badge/Docs-18181B?style=for-the-badge&color=000000" data-illustration></a> <a href="https://github.com/AntelopeJS/dms"><img data-illustration alt="Star AntelopeJS DMS" src="https://img.shields.io/github/stars/AntelopeJS/dms?label=Star%20AntelopeJS%20DMS&style=for-the-badge&labelColor=000000&color=000000&logo=github"></a>
|
|
4
8
|
|
|
5
|
-
|
|
6
|
-
<a href="./LICENSE"><img alt="License" src="https://img.shields.io/npm/l/@antelopejs/dms-database?style=for-the-badge&labelColor=000000&color=000000"></a>
|
|
7
|
-
<a href="https://discord.gg/g4pFt6eXqu"><img alt="Discord" src="https://img.shields.io/badge/Discord-18181B?logo=discord&style=for-the-badge&color=000000"></a>
|
|
8
|
-
<a href="https://dms.antelopejs.com/docs/modules/database"><img alt="Documentation" src="https://img.shields.io/badge/Docs-18181B?style=for-the-badge&color=000000"></a>
|
|
9
|
+
**See your schemas, browse and fix rows, and run queries, from the dashboard your team already uses.**
|
|
9
10
|
|
|
10
|
-
|
|
11
|
+
[Try it in the live demo](https://dms-demo.antelopejs.com/modules/database/overview) · [Documentation](https://dms.antelopejs.com/docs/modules/database) · [All modules](https://github.com/AntelopeJS/dms#modules)
|
|
11
12
|
|
|
12
13
|
</div>
|
|
13
14
|
|
|
14
|
-
|
|
15
|
+
<img data-illustration src="./.github/readme/hero.png" width="100%" alt="The Database diagram in the dark theme: the helio_deals, helio_customers and helio_team tables of the Helio schema, with their columns and the customer and owner relations between them.">
|
|
15
16
|
|
|
16
17
|
## What it does
|
|
17
18
|
|
|
@@ -61,10 +62,10 @@ Restart the backend, then the frontend, sign in as the platform owner and open *
|
|
|
61
62
|
| `@antelopejs/interface-api` | `>=0.3.0 <1.0.0` | `0.3.0` |
|
|
62
63
|
| `@antelopejs/interface-api-util` | `>=0.3.0 <1.0.0` | `0.3.0` |
|
|
63
64
|
| `@antelopejs/interface-core` | `>=0.4.0 <1.0.0` | `0.4.0` |
|
|
64
|
-
| `@antelopejs/interface-database` | `>=0.3.
|
|
65
|
-
| `@antelopejs/interface-database-decorators` | `>=0.2.
|
|
65
|
+
| `@antelopejs/interface-database` | `>=0.3.1 <1.0.0` | `0.3.1` |
|
|
66
|
+
| `@antelopejs/interface-database-decorators` | `>=0.2.1 <1.0.0` | `0.2.1` |
|
|
66
67
|
| `@antelopejs/interface-dms` | `>=0.12.0 <1.0.0` | `0.12.0` |
|
|
67
|
-
| `@antelopejs/interface-dms-automation` | `>=0.6.
|
|
68
|
+
| `@antelopejs/interface-dms-automation` | `>=0.6.1 <1.0.0` | `0.6.1` |
|
|
68
69
|
|
|
69
70
|
<!-- antelopejs-docs-compat:end -->
|
|
70
71
|
|
|
@@ -83,7 +84,7 @@ The canonical guide lives in [`docs/`](./docs), including the [supported extensi
|
|
|
83
84
|
|
|
84
85
|
## Contributing
|
|
85
86
|
|
|
86
|
-
Read [CONTRIBUTING.md](./CONTRIBUTING.md) before opening a pull request. The playground registers a `demo` schema and a `shop` schema with `eu` and `us` instances, seeded on first start.
|
|
87
|
+
Read [CONTRIBUTING.md](./CONTRIBUTING.md) before opening a pull request. The playground registers a `demo` schema and a `shop` schema with `eu` and `us` instances, seeded on first start. It runs on MongoDB by default; set `PLAYGROUND_DATABASE=postgres` to run it on PostgreSQL through `@antelopejs/postgres`, with `POSTGRES_URL` naming the database (default `postgres://postgres@localhost:5432/playground_dms_database`, which must exist).
|
|
87
88
|
|
|
88
89
|
One root install includes the backend and shipped Vue module, retaining their separate lockfiles. The playground remains independent: run `pnpm --dir playground install --ignore-workspace --frozen-lockfile` before starting it. Use the root scripts below rather than recursive scripts: frontend `build` and `typecheck` need the playground or a generated Inertia workspace, and root lint already checks the Vue module.
|
|
89
90
|
|
|
@@ -106,6 +107,28 @@ pnpm test
|
|
|
106
107
|
|
|
107
108
|
</details>
|
|
108
109
|
|
|
110
|
+
## Part of AntelopeJS DMS
|
|
111
|
+
|
|
112
|
+
This module installs into [AntelopeJS DMS](https://github.com/AntelopeJS/dms), the open-source back office. Every module adds its pages to the same dashboard, behind the same sign-in and roles.
|
|
113
|
+
|
|
114
|
+
<!-- antelopejs-dms-modules:start -->
|
|
115
|
+
|
|
116
|
+
| Module | What it adds |
|
|
117
|
+
| ---------------------------------------------------------------- | ---------------------------------------------------------------------------------------- |
|
|
118
|
+
| [`dms-builder`](https://github.com/AntelopeJS/dms-builder) | Edit pages, tables and data sources by clicking, as TypeScript that compiles |
|
|
119
|
+
| [`dms-ai`](https://github.com/AntelopeJS/dms-ai) | An assistant chat in the dashboard, on your own Claude Code or Codex |
|
|
120
|
+
| [`dms-database`](https://github.com/AntelopeJS/dms-database) | Schemas, relation diagrams, a data browser and a query console |
|
|
121
|
+
| [`dms-api`](https://github.com/AntelopeJS/dms-api) | API health, request logs, per-route statistics and a request tester |
|
|
122
|
+
| [`dms-automation`](https://github.com/AntelopeJS/dms-automation) | Node-graph automations on schedules, webhooks and DMS events, with a trace for every run |
|
|
123
|
+
| [`dms-mailing`](https://github.com/AntelopeJS/dms-mailing) | E-mail templates in a block editor, versions, a send log and delivery metrics |
|
|
124
|
+
| [`dms-lang`](https://github.com/AntelopeJS/dms-lang) | Translation coverage, a translation matrix and a translation queue |
|
|
125
|
+
| [`dms-media`](https://github.com/AntelopeJS/dms-media) | A media library with folders, per-folder permissions, image sizes and light editing |
|
|
126
|
+
| [`dms-saas`](https://github.com/AntelopeJS/dms-saas) | Self-service sign-up, plans that gate features, and Stripe billing |
|
|
127
|
+
| [`dms-marketing`](https://github.com/AntelopeJS/dms-marketing) | Traffic, conversion funnels with A/B splits and click heatmaps, without cookies |
|
|
128
|
+
| [`dms-frontend`](https://github.com/AntelopeJS/dms-frontend) | The `ajs dms` CLI, the Vue renderer and the SDK every frontend module builds on |
|
|
129
|
+
|
|
130
|
+
<!-- antelopejs-dms-modules:end -->
|
|
131
|
+
|
|
109
132
|
## License
|
|
110
133
|
|
|
111
134
|
[Apache-2.0](./LICENSE)
|
package/dist/service/browse.js
CHANGED
|
@@ -8,6 +8,7 @@ exports.fetchTotal = fetchTotal;
|
|
|
8
8
|
exports.fetchColumns = fetchColumns;
|
|
9
9
|
const interface_api_util_1 = require("@antelopejs/interface-api-util");
|
|
10
10
|
const interface_database_1 = require("@antelopejs/interface-database");
|
|
11
|
+
const declaredFields_1 = require("./declaredFields");
|
|
11
12
|
const introspect_1 = require("./introspect");
|
|
12
13
|
const guards_1 = require("../utils/guards");
|
|
13
14
|
const query_1 = require("../utils/query");
|
|
@@ -46,8 +47,7 @@ function resolveSelection(schemaFilter, instanceFilter, tableFilter) {
|
|
|
46
47
|
function resolveTable(selection) {
|
|
47
48
|
const schema = interface_database_1.Schema.get(selection.schema);
|
|
48
49
|
(0, interface_api_util_1.assert)(schema, 404, `Unknown schema: ${selection.schema}`);
|
|
49
|
-
|
|
50
|
-
(0, interface_api_util_1.assert)(definition, 404, `Unknown table: ${selection.table}`);
|
|
50
|
+
(0, interface_api_util_1.assert)(Object.hasOwn(schema.definition, selection.table), 404, `Unknown table: ${selection.table}`);
|
|
51
51
|
return schema.instance(selection.instance).table(selection.table);
|
|
52
52
|
}
|
|
53
53
|
async function refinePage(sorted, query) {
|
|
@@ -70,10 +70,12 @@ async function refinePage(sorted, query) {
|
|
|
70
70
|
}
|
|
71
71
|
async function fetchRows(query) {
|
|
72
72
|
const table = resolveTable(query);
|
|
73
|
+
const primaryKey = (0, introspect_1.getTablePrimaryKey)(query.schema, query.table);
|
|
73
74
|
const sorted = query.sortKey
|
|
74
75
|
? table.orderBy(query.sortKey, query.sortDirection)
|
|
75
|
-
:
|
|
76
|
-
|
|
76
|
+
: primaryKey
|
|
77
|
+
? table.orderBy(primaryKey)
|
|
78
|
+
: table;
|
|
77
79
|
const hasRefine = Boolean(query.search) || query.columnFilters.length > 0;
|
|
78
80
|
if (!hasRefine) {
|
|
79
81
|
const sliced = sorted.slice(query.offset, query.limit);
|
|
@@ -121,7 +123,34 @@ async function fetchColumns(selection) {
|
|
|
121
123
|
}
|
|
122
124
|
}
|
|
123
125
|
}
|
|
124
|
-
|
|
126
|
+
const declared = (0, declaredFields_1.getDeclaredFieldTypes)(selection.schema, selection.table, columns);
|
|
127
|
+
for (const column of columns) {
|
|
128
|
+
const descriptor = declared.get(column);
|
|
129
|
+
const type = descriptor && gridTypeOf(descriptor);
|
|
130
|
+
if (type)
|
|
131
|
+
typeByColumn.set(column, type);
|
|
132
|
+
}
|
|
133
|
+
const ordered = (0, declaredFields_1.getDeclaredFieldOrder)(selection.schema, selection.table).filter((name) => typeByColumn.has(name));
|
|
134
|
+
const extra = columns.filter((name) => !ordered.includes(name));
|
|
135
|
+
return {
|
|
136
|
+
columns: [...ordered, ...extra],
|
|
137
|
+
types: Object.fromEntries(typeByColumn),
|
|
138
|
+
};
|
|
139
|
+
}
|
|
140
|
+
const GRID_TYPE_BY_KIND = new Map([
|
|
141
|
+
["string", "string"],
|
|
142
|
+
["number", "number"],
|
|
143
|
+
["boolean", "boolean"],
|
|
144
|
+
["date", "date"],
|
|
145
|
+
["array", "array"],
|
|
146
|
+
["tuple", "array"],
|
|
147
|
+
["object", "object"],
|
|
148
|
+
["record", "object"],
|
|
149
|
+
]);
|
|
150
|
+
function gridTypeOf(descriptor) {
|
|
151
|
+
if (descriptor.kind === "refinement")
|
|
152
|
+
return gridTypeOf(descriptor.base);
|
|
153
|
+
return GRID_TYPE_BY_KIND.get(descriptor.kind);
|
|
125
154
|
}
|
|
126
155
|
function jsTypeOf(value) {
|
|
127
156
|
if (value === null)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browse.js","sourceRoot":"","sources":["../../src/service/browse.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"browse.js","sourceRoot":"","sources":["../../src/service/browse.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import type { Class } from "@antelopejs/interface-core/decorators";
|
|
2
|
+
import type { Schema } from "@antelopejs/interface-database";
|
|
3
|
+
import { type Table } from "@antelopejs/interface-database-decorators";
|
|
4
|
+
import { type FieldDescriptor } from "./fieldDescriptor";
|
|
5
|
+
interface DeclaredFields {
|
|
6
|
+
ordered: string[];
|
|
7
|
+
types: Record<string, FieldDescriptor>;
|
|
8
|
+
}
|
|
9
|
+
export type SchemaTableDefinition = Schema["definition"][string];
|
|
10
|
+
export declare function decoratedFieldsOf(TableClass?: Class<Table>): DeclaredFields;
|
|
11
|
+
export declare function declaredFieldTypes(def: SchemaTableDefinition, declared: DeclaredFields): Map<string, FieldDescriptor>;
|
|
12
|
+
export declare function getDeclaredFieldTypes(schemaId: string, tableName: string, columns: readonly string[]): Map<string, FieldDescriptor>;
|
|
13
|
+
export declare function getDeclaredFieldOrder(schemaId: string, tableName: string): string[];
|
|
14
|
+
export {};
|
|
@@ -0,0 +1,106 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.decoratedFieldsOf = decoratedFieldsOf;
|
|
4
|
+
exports.declaredFieldTypes = declaredFieldTypes;
|
|
5
|
+
exports.getDeclaredFieldTypes = getDeclaredFieldTypes;
|
|
6
|
+
exports.getDeclaredFieldOrder = getDeclaredFieldOrder;
|
|
7
|
+
const interface_database_decorators_1 = require("@antelopejs/interface-database-decorators");
|
|
8
|
+
const guards_1 = require("../utils/guards");
|
|
9
|
+
const fieldDescriptor_1 = require("./fieldDescriptor");
|
|
10
|
+
const schemaRegistry_1 = require("./schemaRegistry");
|
|
11
|
+
const DESIGN_TYPE_DESCRIPTORS = new Map([
|
|
12
|
+
[String, () => ({ kind: "string" })],
|
|
13
|
+
[Number, () => ({ kind: "number" })],
|
|
14
|
+
[Boolean, () => ({ kind: "boolean" })],
|
|
15
|
+
[Date, () => ({ kind: "date" })],
|
|
16
|
+
[Array, () => ({ kind: "array" })],
|
|
17
|
+
]);
|
|
18
|
+
function collectDecoratedFields(TableClass) {
|
|
19
|
+
const ordered = [];
|
|
20
|
+
const seen = new Set();
|
|
21
|
+
const push = (name) => {
|
|
22
|
+
if (!name || seen.has(name))
|
|
23
|
+
return;
|
|
24
|
+
seen.add(name);
|
|
25
|
+
ordered.push(name);
|
|
26
|
+
};
|
|
27
|
+
try {
|
|
28
|
+
const instance = new TableClass();
|
|
29
|
+
for (const name of Object.keys(instance))
|
|
30
|
+
push(name);
|
|
31
|
+
}
|
|
32
|
+
catch { }
|
|
33
|
+
const datumMeta = (0, interface_database_decorators_1.getMetadata)(TableClass, interface_database_decorators_1.DatumStaticMetadata, true);
|
|
34
|
+
if (datumMeta.primary && !seen.has(datumMeta.primary)) {
|
|
35
|
+
seen.add(datumMeta.primary);
|
|
36
|
+
ordered.unshift(datumMeta.primary);
|
|
37
|
+
}
|
|
38
|
+
for (const fields of Object.values(datumMeta.indexes)) {
|
|
39
|
+
for (const name of fields)
|
|
40
|
+
push(name);
|
|
41
|
+
}
|
|
42
|
+
const relationMeta = (0, interface_database_decorators_1.getMetadata)(TableClass, interface_database_decorators_1.RelationStaticMetadata, true);
|
|
43
|
+
for (const name of Object.keys(relationMeta.relations))
|
|
44
|
+
push(name);
|
|
45
|
+
const modifierMeta = (0, interface_database_decorators_1.getMetadata)(TableClass, interface_database_decorators_1.ModifiersStaticMetadata, true);
|
|
46
|
+
for (const name of Object.keys(modifierMeta.fields ?? {}))
|
|
47
|
+
push(name);
|
|
48
|
+
const types = {};
|
|
49
|
+
for (const name of ordered) {
|
|
50
|
+
const descriptor = designTypeOf(TableClass, name);
|
|
51
|
+
if (descriptor)
|
|
52
|
+
types[name] = descriptor;
|
|
53
|
+
}
|
|
54
|
+
return { ordered, types };
|
|
55
|
+
}
|
|
56
|
+
function designTypeOf(TableClass, name) {
|
|
57
|
+
const prototype = TableClass.prototype;
|
|
58
|
+
if (!(0, guards_1.isObject)(prototype))
|
|
59
|
+
return undefined;
|
|
60
|
+
return DESIGN_TYPE_DESCRIPTORS.get(Reflect.getMetadata("design:type", prototype, name))?.();
|
|
61
|
+
}
|
|
62
|
+
function decoratedFieldsOf(TableClass) {
|
|
63
|
+
return TableClass
|
|
64
|
+
? collectDecoratedFields(TableClass)
|
|
65
|
+
: { ordered: [], types: {} };
|
|
66
|
+
}
|
|
67
|
+
function declaredFieldTypes(def, declared) {
|
|
68
|
+
const types = new Map();
|
|
69
|
+
for (const [name, value] of Object.entries(def.fields ?? {})) {
|
|
70
|
+
types.set(name, (0, fieldDescriptor_1.toFieldDescriptor)(value));
|
|
71
|
+
}
|
|
72
|
+
for (const [name, descriptor] of Object.entries(declared.types)) {
|
|
73
|
+
if (!types.has(name))
|
|
74
|
+
types.set(name, descriptor);
|
|
75
|
+
}
|
|
76
|
+
return types;
|
|
77
|
+
}
|
|
78
|
+
function getDeclaredFieldTypes(schemaId, tableName, columns) {
|
|
79
|
+
const def = (0, schemaRegistry_1.getRegistry)().get(schemaId)?.definition[tableName];
|
|
80
|
+
if (!def)
|
|
81
|
+
return new Map();
|
|
82
|
+
const TableClass = (0, interface_database_decorators_1.getTablesForSchema)(schemaId)?.[tableName];
|
|
83
|
+
const types = declaredFieldTypes(def, decoratedFieldsOf(TableClass));
|
|
84
|
+
if (!TableClass)
|
|
85
|
+
return types;
|
|
86
|
+
for (const column of columns) {
|
|
87
|
+
const descriptor = types.has(column)
|
|
88
|
+
? undefined
|
|
89
|
+
: designTypeOf(TableClass, column);
|
|
90
|
+
if (descriptor)
|
|
91
|
+
types.set(column, descriptor);
|
|
92
|
+
}
|
|
93
|
+
const modified = (0, interface_database_decorators_1.getMetadata)(TableClass, interface_database_decorators_1.ModifiersStaticMetadata, true);
|
|
94
|
+
for (const [name, mods] of Object.entries(modified.fields ?? {})) {
|
|
95
|
+
if (mods.some(({ modifier }) => "unlock" in modifier))
|
|
96
|
+
types.delete(name);
|
|
97
|
+
}
|
|
98
|
+
return types;
|
|
99
|
+
}
|
|
100
|
+
function getDeclaredFieldOrder(schemaId, tableName) {
|
|
101
|
+
const def = (0, schemaRegistry_1.getRegistry)().get(schemaId)?.definition[tableName];
|
|
102
|
+
const TableClass = (0, interface_database_decorators_1.getTablesForSchema)(schemaId)?.[tableName];
|
|
103
|
+
const decorated = decoratedFieldsOf(TableClass).ordered;
|
|
104
|
+
return [...new Set([...decorated, ...Object.keys(def?.fields ?? {})])];
|
|
105
|
+
}
|
|
106
|
+
//# sourceMappingURL=declaredFields.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"declaredFields.js","sourceRoot":"","sources":["../../src/service/declaredFields.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ const interface_database_1 = require("@antelopejs/interface-database");
|
|
|
11
11
|
const interface_database_decorators_1 = require("@antelopejs/interface-database-decorators");
|
|
12
12
|
const config_1 = require("../config");
|
|
13
13
|
const guards_1 = require("../utils/guards");
|
|
14
|
-
const
|
|
14
|
+
const declaredFields_1 = require("./declaredFields");
|
|
15
15
|
const schemaLabels_1 = require("./schemaLabels");
|
|
16
16
|
const schemaRegistry_1 = require("./schemaRegistry");
|
|
17
17
|
const STATS_TTL_MS = 30_000;
|
|
@@ -181,14 +181,14 @@ function inferFromRows(rows) {
|
|
|
181
181
|
observed.set(key, field);
|
|
182
182
|
}
|
|
183
183
|
}
|
|
184
|
-
const inferred =
|
|
184
|
+
const inferred = [];
|
|
185
185
|
for (const [key, { type, nullable }] of observed) {
|
|
186
186
|
if (type)
|
|
187
|
-
inferred[key
|
|
187
|
+
inferred.push([key, nullable ? withNull(type) : type]);
|
|
188
188
|
else if (nullable)
|
|
189
|
-
inferred[key
|
|
189
|
+
inferred.push([key, NULL_DESCRIPTOR]);
|
|
190
190
|
}
|
|
191
|
-
return inferred;
|
|
191
|
+
return Object.fromEntries(inferred);
|
|
192
192
|
}
|
|
193
193
|
async function inferTableFields(schemaId, schema, tableName) {
|
|
194
194
|
const cacheKey = `${schemaId}::${tableName}`;
|
|
@@ -203,99 +203,43 @@ async function inferTableFields(schemaId, schema, tableName) {
|
|
|
203
203
|
});
|
|
204
204
|
return inferred;
|
|
205
205
|
}
|
|
206
|
-
const DESIGN_TYPE_DESCRIPTORS = new Map([
|
|
207
|
-
[String, () => ({ kind: "string" })],
|
|
208
|
-
[Number, () => ({ kind: "number" })],
|
|
209
|
-
[Boolean, () => ({ kind: "boolean" })],
|
|
210
|
-
[Date, () => ({ kind: "date" })],
|
|
211
|
-
[Array, () => ({ kind: "array" })],
|
|
212
|
-
]);
|
|
213
|
-
function collectDecoratedFields(TableClass) {
|
|
214
|
-
const ordered = [];
|
|
215
|
-
const seen = new Set();
|
|
216
|
-
const push = (name) => {
|
|
217
|
-
if (!name || seen.has(name))
|
|
218
|
-
return;
|
|
219
|
-
seen.add(name);
|
|
220
|
-
ordered.push(name);
|
|
221
|
-
};
|
|
222
|
-
try {
|
|
223
|
-
const instance = new TableClass();
|
|
224
|
-
for (const name of Object.keys(instance))
|
|
225
|
-
push(name);
|
|
226
|
-
}
|
|
227
|
-
catch { }
|
|
228
|
-
const datumMeta = (0, interface_database_decorators_1.getMetadata)(TableClass, interface_database_decorators_1.DatumStaticMetadata, true);
|
|
229
|
-
if (datumMeta.primary && !seen.has(datumMeta.primary)) {
|
|
230
|
-
seen.add(datumMeta.primary);
|
|
231
|
-
ordered.unshift(datumMeta.primary);
|
|
232
|
-
}
|
|
233
|
-
for (const fields of Object.values(datumMeta.indexes)) {
|
|
234
|
-
for (const name of fields)
|
|
235
|
-
push(name);
|
|
236
|
-
}
|
|
237
|
-
const relationMeta = (0, interface_database_decorators_1.getMetadata)(TableClass, interface_database_decorators_1.RelationStaticMetadata, true);
|
|
238
|
-
for (const name of Object.keys(relationMeta.relations))
|
|
239
|
-
push(name);
|
|
240
|
-
const modifierMeta = (0, interface_database_decorators_1.getMetadata)(TableClass, interface_database_decorators_1.ModifiersStaticMetadata, true);
|
|
241
|
-
for (const name of Object.keys(modifierMeta.fields ?? {}))
|
|
242
|
-
push(name);
|
|
243
|
-
const types = {};
|
|
244
|
-
const prototype = TableClass.prototype;
|
|
245
|
-
for (const name of ordered) {
|
|
246
|
-
if (!(0, guards_1.isObject)(prototype))
|
|
247
|
-
break;
|
|
248
|
-
const describe = DESIGN_TYPE_DESCRIPTORS.get(Reflect.getMetadata("design:type", prototype, name));
|
|
249
|
-
if (describe)
|
|
250
|
-
types[name] = describe();
|
|
251
|
-
}
|
|
252
|
-
return { ordered, types };
|
|
253
|
-
}
|
|
254
206
|
async function summarizeTable(id, schema, tableName, def, tableClasses) {
|
|
255
207
|
const TableClass = tableClasses?.[tableName];
|
|
256
208
|
const relations = TableClass
|
|
257
209
|
? resolveRelations(id, tableName, TableClass)
|
|
258
210
|
: [];
|
|
259
|
-
const declared = TableClass
|
|
260
|
-
? collectDecoratedFields(TableClass)
|
|
261
|
-
: { ordered: [], types: {} };
|
|
211
|
+
const declared = (0, declaredFields_1.decoratedFieldsOf)(TableClass);
|
|
262
212
|
const sampled = await inferTableFields(id, schema, tableName);
|
|
263
213
|
const modifiers = resolveModifiers(TableClass);
|
|
264
|
-
const
|
|
265
|
-
const
|
|
266
|
-
for (const [name, value] of Object.entries(definitionFields)) {
|
|
267
|
-
fromDefinition.set(name, (0, fieldDescriptor_1.toFieldDescriptor)(value));
|
|
268
|
-
}
|
|
214
|
+
const declaredTypes = (0, declaredFields_1.declaredFieldTypes)(def, declared);
|
|
215
|
+
const sampledOf = (name) => Object.hasOwn(sampled, name) ? sampled[name] : undefined;
|
|
269
216
|
const withSampled = (name, descriptor) => {
|
|
270
|
-
const seen =
|
|
217
|
+
const seen = sampledOf(name);
|
|
271
218
|
const element = arrayOf(seen)?.element;
|
|
272
219
|
const typed = descriptor.kind === "array" && !descriptor.element && element
|
|
273
220
|
? { kind: "array", element }
|
|
274
221
|
: descriptor;
|
|
275
222
|
return seen && admitsNull(seen) ? withNull(typed) : typed;
|
|
276
223
|
};
|
|
277
|
-
const fields =
|
|
224
|
+
const fields = new Map();
|
|
278
225
|
for (const name of declared.ordered) {
|
|
279
|
-
fields
|
|
280
|
-
declared.types[name] ??
|
|
281
|
-
sampled[name] ??
|
|
282
|
-
UNKNOWN_DESCRIPTOR);
|
|
226
|
+
fields.set(name, withSampled(name, declaredTypes.get(name) ?? sampledOf(name) ?? UNKNOWN_DESCRIPTOR));
|
|
283
227
|
}
|
|
284
|
-
for (const [name, descriptor] of
|
|
285
|
-
if (!
|
|
286
|
-
fields
|
|
228
|
+
for (const [name, descriptor] of declaredTypes) {
|
|
229
|
+
if (!fields.has(name))
|
|
230
|
+
fields.set(name, withSampled(name, descriptor));
|
|
287
231
|
}
|
|
288
232
|
for (const [column, descriptor] of Object.entries(sampled)) {
|
|
289
|
-
if (!
|
|
290
|
-
fields
|
|
233
|
+
if (!fields.has(column))
|
|
234
|
+
fields.set(column, descriptor);
|
|
291
235
|
}
|
|
292
236
|
for (const name of Object.keys(modifiers)) {
|
|
293
|
-
if (!
|
|
294
|
-
fields
|
|
237
|
+
if (!fields.has(name))
|
|
238
|
+
fields.set(name, UNKNOWN_DESCRIPTOR);
|
|
295
239
|
}
|
|
296
240
|
return {
|
|
297
241
|
name: tableName,
|
|
298
|
-
fields,
|
|
242
|
+
fields: Object.fromEntries(fields),
|
|
299
243
|
indexes: def.indexes,
|
|
300
244
|
relations,
|
|
301
245
|
modifiers,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"introspect.js","sourceRoot":"","sources":["../../src/service/introspect.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"introspect.js","sourceRoot":"","sources":["../../src/service/introspect.ts"],"names":[],"mappings":"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"}
|
|
@@ -87,7 +87,7 @@ async function describeUnknownQueryTarget(target) {
|
|
|
87
87
|
const schema = interface_database_1.Schema.get(target.schema);
|
|
88
88
|
if (!schema)
|
|
89
89
|
return `Unknown schema "${target.schema}"`;
|
|
90
|
-
if (target.table && !(target.table
|
|
90
|
+
if (target.table && !Object.hasOwn(schema.definition, target.table)) {
|
|
91
91
|
return `Unknown table "${target.table}" in schema ${target.schema}`;
|
|
92
92
|
}
|
|
93
93
|
const instance = target.instance;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queryInspection.js","sourceRoot":"","sources":["../../src/service/queryInspection.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"queryInspection.js","sourceRoot":"","sources":["../../src/service/queryInspection.ts"],"names":[],"mappings":"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"}
|
|
@@ -341,13 +341,12 @@ export function relationEdges(
|
|
|
341
341
|
label: relation.fromField,
|
|
342
342
|
many: relation.many,
|
|
343
343
|
ends: {
|
|
344
|
-
sourceBase:
|
|
345
|
-
relation.fromField
|
|
346
|
-
|
|
347
|
-
: '__node__',
|
|
344
|
+
sourceBase: Object.hasOwn(table.fields, relation.fromField)
|
|
345
|
+
? relation.fromField
|
|
346
|
+
: '__node__',
|
|
348
347
|
targetBase: isStubTarget
|
|
349
348
|
? 'stub'
|
|
350
|
-
: target &&
|
|
349
|
+
: target && Object.hasOwn(target.fields, relation.toField)
|
|
351
350
|
? relation.toField
|
|
352
351
|
: '__node__',
|
|
353
352
|
isStubTarget,
|
|
@@ -10,7 +10,6 @@ import {
|
|
|
10
10
|
DEFAULT_ASPECT,
|
|
11
11
|
linkedGroups,
|
|
12
12
|
packBlocks,
|
|
13
|
-
prefixOrder,
|
|
14
13
|
type Rect,
|
|
15
14
|
type Size,
|
|
16
15
|
} from './packing'
|
|
@@ -76,8 +75,8 @@ function layOutGroup(
|
|
|
76
75
|
* Lays out the whole schema, every table and a stub for each table of
|
|
77
76
|
* another schema a relation points to: dagre on each group of tables linked
|
|
78
77
|
* by relations, a stub staying with the tables it hangs from, then the
|
|
79
|
-
* groups, largest first, and the tables on their own, by name
|
|
80
|
-
*
|
|
78
|
+
* groups, largest first, and the tables on their own, by name, in rows
|
|
79
|
+
* shaped like the canvas. Tables count at their folded height.
|
|
81
80
|
*/
|
|
82
81
|
export function layOutSchema(
|
|
83
82
|
schema: SchemaSummary,
|
|
@@ -109,10 +108,12 @@ export function layOutSchema(
|
|
|
109
108
|
groups.sort(
|
|
110
109
|
(a, b) => b.count - a.count || b.width * b.height - a.width * a.height,
|
|
111
110
|
)
|
|
112
|
-
const single: Block[] =
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
111
|
+
const single: Block[] = alone
|
|
112
|
+
.sort((a, b) => a.localeCompare(b))
|
|
113
|
+
.map((name) => {
|
|
114
|
+
const id = tableNodeId(schema.id, name)
|
|
115
|
+
return { id, ...(sizes.get(id) as Size) }
|
|
116
|
+
})
|
|
116
117
|
|
|
117
118
|
const packed = packBlocks(
|
|
118
119
|
[...groups, ...single],
|