directus 9.1.2 → 9.2.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/dist/auth.js +5 -3
- package/dist/cli/commands/database/install.js +2 -4
- package/dist/cli/commands/schema/apply.js +26 -10
- package/dist/controllers/assets.js +0 -27
- package/dist/controllers/auth.js +7 -2
- package/dist/controllers/extensions.js +1 -1
- package/dist/database/{functions/types.d.ts → helpers/date/dialects/mssql.d.ts} +2 -1
- package/dist/database/{functions → helpers/date}/dialects/mssql.js +4 -6
- package/dist/database/{functions → helpers/date}/dialects/mysql.d.ts +2 -4
- package/dist/database/{functions → helpers/date}/dialects/mysql.js +4 -6
- package/dist/database/{functions/dialects/mssql.d.ts → helpers/date/dialects/oracle.d.ts} +2 -4
- package/dist/database/{functions → helpers/date}/dialects/oracle.js +4 -6
- package/dist/database/helpers/date/dialects/postgres.d.ts +12 -0
- package/dist/database/{functions → helpers/date}/dialects/postgres.js +4 -6
- package/dist/database/{functions → helpers/date}/dialects/sqlite.d.ts +3 -4
- package/dist/database/helpers/date/dialects/sqlite.js +35 -0
- package/dist/database/helpers/date/index.d.ts +6 -0
- package/dist/database/helpers/date/index.js +15 -0
- package/dist/database/helpers/date/types.d.ts +13 -0
- package/dist/database/helpers/date/types.js +10 -0
- package/dist/database/helpers/geometry/dialects/mssql.d.ts +14 -0
- package/dist/database/helpers/geometry/dialects/mssql.js +36 -0
- package/dist/database/helpers/geometry/dialects/mysql.d.ts +7 -0
- package/dist/database/helpers/geometry/dialects/mysql.js +16 -0
- package/dist/database/helpers/geometry/dialects/oracle.d.ts +15 -0
- package/dist/database/helpers/geometry/dialects/oracle.js +39 -0
- package/dist/database/helpers/geometry/dialects/postgres.d.ts +10 -0
- package/dist/database/helpers/geometry/dialects/postgres.js +23 -0
- package/dist/database/helpers/geometry/dialects/redshift.d.ts +7 -0
- package/dist/database/helpers/geometry/dialects/redshift.js +16 -0
- package/dist/database/helpers/geometry/dialects/sqlite.d.ts +6 -0
- package/dist/database/helpers/geometry/dialects/sqlite.js +14 -0
- package/dist/database/helpers/geometry/index.d.ts +6 -0
- package/dist/database/helpers/geometry/index.js +15 -0
- package/dist/database/helpers/{geometry.d.ts → geometry/types.d.ts} +3 -7
- package/dist/database/helpers/geometry/types.js +54 -0
- package/dist/database/helpers/index.d.ts +8 -0
- package/dist/database/helpers/index.js +33 -0
- package/dist/database/helpers/types.d.ts +5 -0
- package/dist/database/helpers/types.js +9 -0
- package/dist/database/index.js +6 -6
- package/dist/database/run-ast.js +5 -5
- package/dist/database/seeds/run.js +3 -3
- package/dist/database/system-data/fields/notifications.yaml +1 -0
- package/dist/env.js +1 -0
- package/dist/extensions.js +17 -2
- package/dist/middleware/sanitize-query.js +1 -1
- package/dist/services/activity.js +7 -2
- package/dist/services/assets.js +14 -0
- package/dist/services/fields.d.ts +2 -0
- package/dist/services/fields.js +57 -26
- package/dist/services/files.d.ts +1 -1
- package/dist/services/files.js +13 -11
- package/dist/services/graphql.js +3 -0
- package/dist/services/items.js +18 -29
- package/dist/services/payload.d.ts +2 -0
- package/dist/services/payload.js +3 -3
- package/dist/utils/apply-query.js +9 -11
- package/dist/utils/apply-snapshot.js +27 -28
- package/dist/utils/get-column.js +2 -2
- package/dist/utils/get-default-index-name.js +2 -2
- package/dist/utils/get-local-type.js +1 -12
- package/dist/utils/merge-permissions.js +2 -2
- package/dist/utils/sanitize-query.js +1 -12
- package/dist/utils/validate-query.js +1 -1
- package/dist/webhooks.js +16 -24
- package/package.json +13 -13
- package/dist/database/functions/dialects/oracle.d.ts +0 -14
- package/dist/database/functions/dialects/postgres.d.ts +0 -14
- package/dist/database/functions/dialects/sqlite.js +0 -33
- package/dist/database/functions/index.d.ts +0 -3
- package/dist/database/functions/index.js +0 -26
- package/dist/database/functions/types.js +0 -2
- package/dist/database/helpers/date.d.ts +0 -8
- package/dist/database/helpers/date.js +0 -44
- package/dist/database/helpers/geometry.js +0 -189
- package/dist/utils/get-simple-hash.d.ts +0 -5
- package/dist/utils/get-simple-hash.js +0 -15
|
@@ -1,44 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.getDateHelper = void 0;
|
|
7
|
-
const __1 = __importDefault(require(".."));
|
|
8
|
-
let dateHelper;
|
|
9
|
-
function getDateHelper() {
|
|
10
|
-
if (!dateHelper) {
|
|
11
|
-
const db = (0, __1.default)();
|
|
12
|
-
const client = db.client.config.client;
|
|
13
|
-
const constructor = {
|
|
14
|
-
mysql: KnexDate,
|
|
15
|
-
mariadb: KnexDate,
|
|
16
|
-
sqlite3: KnexDate_SQLITE,
|
|
17
|
-
pg: KnexDate,
|
|
18
|
-
postgres: KnexDate,
|
|
19
|
-
redshift: KnexDate,
|
|
20
|
-
mssql: KnexDate,
|
|
21
|
-
oracledb: KnexDate,
|
|
22
|
-
}[client];
|
|
23
|
-
if (!constructor) {
|
|
24
|
-
throw new Error(`Geometry helper not implemented on ${client}.`);
|
|
25
|
-
}
|
|
26
|
-
dateHelper = new constructor(db);
|
|
27
|
-
}
|
|
28
|
-
return dateHelper;
|
|
29
|
-
}
|
|
30
|
-
exports.getDateHelper = getDateHelper;
|
|
31
|
-
class KnexDate {
|
|
32
|
-
constructor(knex) {
|
|
33
|
-
this.knex = knex;
|
|
34
|
-
}
|
|
35
|
-
parseDate(date) {
|
|
36
|
-
return date;
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
class KnexDate_SQLITE extends KnexDate {
|
|
40
|
-
parseDate(date) {
|
|
41
|
-
const newDate = new Date(date);
|
|
42
|
-
return (newDate.getTime() - newDate.getTimezoneOffset() * 60 * 1000).toString();
|
|
43
|
-
}
|
|
44
|
-
}
|
|
@@ -1,189 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.getGeometryHelper = void 0;
|
|
7
|
-
const wellknown_1 = require("wellknown");
|
|
8
|
-
const __1 = require("..");
|
|
9
|
-
const __2 = __importDefault(require(".."));
|
|
10
|
-
let geometryHelper;
|
|
11
|
-
function getGeometryHelper(database) {
|
|
12
|
-
if (!geometryHelper) {
|
|
13
|
-
database = database !== null && database !== void 0 ? database : (0, __2.default)();
|
|
14
|
-
const client = (0, __1.getDatabaseClient)(database);
|
|
15
|
-
const constructor = {
|
|
16
|
-
mysql: KnexSpatial_MySQL,
|
|
17
|
-
sqlite: KnexSpatial_SQLite,
|
|
18
|
-
postgres: KnexSpatial_PG,
|
|
19
|
-
redshift: KnexSpatial_Redshift,
|
|
20
|
-
mssql: KnexSpatial_MSSQL,
|
|
21
|
-
oracle: KnexSpatial_Oracle,
|
|
22
|
-
}[client];
|
|
23
|
-
if (!constructor) {
|
|
24
|
-
throw new Error(`Geometry helper not implemented on ${client}.`);
|
|
25
|
-
}
|
|
26
|
-
geometryHelper = new constructor(database);
|
|
27
|
-
}
|
|
28
|
-
return geometryHelper;
|
|
29
|
-
}
|
|
30
|
-
exports.getGeometryHelper = getGeometryHelper;
|
|
31
|
-
class KnexSpatial {
|
|
32
|
-
constructor(knex) {
|
|
33
|
-
this.knex = knex;
|
|
34
|
-
}
|
|
35
|
-
supported() {
|
|
36
|
-
return true;
|
|
37
|
-
}
|
|
38
|
-
isTrue(expression) {
|
|
39
|
-
return expression;
|
|
40
|
-
}
|
|
41
|
-
isFalse(expression) {
|
|
42
|
-
return expression.wrap('NOT ', '');
|
|
43
|
-
}
|
|
44
|
-
createColumn(table, field) {
|
|
45
|
-
var _a;
|
|
46
|
-
const type = (_a = field.type.split('.')[1]) !== null && _a !== void 0 ? _a : 'geometry';
|
|
47
|
-
return table.specificType(field.field, type);
|
|
48
|
-
}
|
|
49
|
-
asText(table, column) {
|
|
50
|
-
return this.knex.raw('st_astext(??.??) as ??', [table, column, column]);
|
|
51
|
-
}
|
|
52
|
-
asGeoJSON(table, column) {
|
|
53
|
-
return this.knex.raw('st_asgeojson(??.??) as ??', [table, column, column]);
|
|
54
|
-
}
|
|
55
|
-
fromText(text) {
|
|
56
|
-
return this.knex.raw('st_geomfromtext(?, 4326)', text);
|
|
57
|
-
}
|
|
58
|
-
fromGeoJSON(geojson) {
|
|
59
|
-
return this.fromText((0, wellknown_1.stringify)(geojson));
|
|
60
|
-
}
|
|
61
|
-
_intersects(key, geojson) {
|
|
62
|
-
const geometry = this.fromGeoJSON(geojson);
|
|
63
|
-
return this.knex.raw('st_intersects(??, ?)', [key, geometry]);
|
|
64
|
-
}
|
|
65
|
-
intersects(key, geojson) {
|
|
66
|
-
return this.isTrue(this._intersects(key, geojson));
|
|
67
|
-
}
|
|
68
|
-
nintersects(key, geojson) {
|
|
69
|
-
return this.isFalse(this._intersects(key, geojson));
|
|
70
|
-
}
|
|
71
|
-
_intersects_bbox(key, geojson) {
|
|
72
|
-
const geometry = this.fromGeoJSON(geojson);
|
|
73
|
-
return this.knex.raw('st_intersects(??, ?)', [key, geometry]);
|
|
74
|
-
}
|
|
75
|
-
intersects_bbox(key, geojson) {
|
|
76
|
-
return this.isTrue(this._intersects_bbox(key, geojson));
|
|
77
|
-
}
|
|
78
|
-
nintersects_bbox(key, geojson) {
|
|
79
|
-
return this.isFalse(this._intersects_bbox(key, geojson));
|
|
80
|
-
}
|
|
81
|
-
collect(table, column) {
|
|
82
|
-
return this.knex.raw('st_astext(st_collect(??.??))', [table, column]);
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
class KnexSpatial_SQLite extends KnexSpatial {
|
|
86
|
-
async supported() {
|
|
87
|
-
const res = await this.knex.select('name').from('pragma_function_list').where({ name: 'spatialite_version' });
|
|
88
|
-
return res.length > 0;
|
|
89
|
-
}
|
|
90
|
-
asGeoJSON(table, column) {
|
|
91
|
-
return this.knex.raw('asgeojson(??.??) as ??', [table, column, column]);
|
|
92
|
-
}
|
|
93
|
-
}
|
|
94
|
-
class KnexSpatial_PG extends KnexSpatial {
|
|
95
|
-
async supported() {
|
|
96
|
-
const res = await this.knex.select('oid').from('pg_proc').where({ proname: 'postgis_version' });
|
|
97
|
-
return res.length > 0;
|
|
98
|
-
}
|
|
99
|
-
createColumn(table, field) {
|
|
100
|
-
var _a;
|
|
101
|
-
const type = (_a = field.type.split('.')[1]) !== null && _a !== void 0 ? _a : 'geometry';
|
|
102
|
-
return table.specificType(field.field, `geometry(${type}, 4326)`);
|
|
103
|
-
}
|
|
104
|
-
_intersects_bbox(key, geojson) {
|
|
105
|
-
const geometry = this.fromGeoJSON(geojson);
|
|
106
|
-
return this.knex.raw('?? && ?', [key, geometry]);
|
|
107
|
-
}
|
|
108
|
-
}
|
|
109
|
-
class KnexSpatial_MySQL extends KnexSpatial {
|
|
110
|
-
collect(table, column) {
|
|
111
|
-
return this.knex.raw(`concat('geometrycollection(', group_concat(? separator ', '), ')'`, this.asText(table, column));
|
|
112
|
-
}
|
|
113
|
-
fromText(text) {
|
|
114
|
-
return this.knex.raw('st_geomfromtext(?)', text);
|
|
115
|
-
}
|
|
116
|
-
}
|
|
117
|
-
class KnexSpatial_Redshift extends KnexSpatial {
|
|
118
|
-
createColumn(table, field) {
|
|
119
|
-
if (field.type.split('.')[1]) {
|
|
120
|
-
field.meta.special = [field.type];
|
|
121
|
-
}
|
|
122
|
-
return table.specificType(field.field, 'geometry');
|
|
123
|
-
}
|
|
124
|
-
}
|
|
125
|
-
class KnexSpatial_MSSQL extends KnexSpatial {
|
|
126
|
-
isTrue(expression) {
|
|
127
|
-
return expression.wrap(``, ` = 1`);
|
|
128
|
-
}
|
|
129
|
-
isFalse(expression) {
|
|
130
|
-
return expression.wrap(``, ` = 0`);
|
|
131
|
-
}
|
|
132
|
-
createColumn(table, field) {
|
|
133
|
-
if (field.type.split('.')[1]) {
|
|
134
|
-
field.meta.special = [field.type];
|
|
135
|
-
}
|
|
136
|
-
return table.specificType(field.field, 'geometry');
|
|
137
|
-
}
|
|
138
|
-
asText(table, column) {
|
|
139
|
-
return this.knex.raw('??.??.STAsText() as ??', [table, column, column]);
|
|
140
|
-
}
|
|
141
|
-
fromText(text) {
|
|
142
|
-
return this.knex.raw('geometry::STGeomFromText(?, 4326)', text);
|
|
143
|
-
}
|
|
144
|
-
_intersects(key, geojson) {
|
|
145
|
-
const geometry = this.fromGeoJSON(geojson);
|
|
146
|
-
return this.knex.raw('??.STIntersects(?)', [key, geometry]);
|
|
147
|
-
}
|
|
148
|
-
_intersects_bbox(key, geojson) {
|
|
149
|
-
const geometry = this.fromGeoJSON(geojson);
|
|
150
|
-
return this.knex.raw('??.STEnvelope().STIntersects(?.STEnvelope())', [key, geometry]);
|
|
151
|
-
}
|
|
152
|
-
collect(table, column) {
|
|
153
|
-
return this.knex.raw('geometry::CollectionAggregate(??.??).STAsText()', [table, column]);
|
|
154
|
-
}
|
|
155
|
-
}
|
|
156
|
-
class KnexSpatial_Oracle extends KnexSpatial {
|
|
157
|
-
isTrue(expression) {
|
|
158
|
-
return expression.wrap(``, ` = 'TRUE'`);
|
|
159
|
-
}
|
|
160
|
-
isFalse(expression) {
|
|
161
|
-
return expression.wrap(``, ` = 'FALSE'`);
|
|
162
|
-
}
|
|
163
|
-
createColumn(table, field) {
|
|
164
|
-
if (field.type.split('.')[1]) {
|
|
165
|
-
field.meta.special = [field.type];
|
|
166
|
-
}
|
|
167
|
-
return table.specificType(field.field, 'sdo_geometry');
|
|
168
|
-
}
|
|
169
|
-
asText(table, column) {
|
|
170
|
-
return this.knex.raw('sdo_util.to_wktgeometry(??.??) as ??', [table, column, column]);
|
|
171
|
-
}
|
|
172
|
-
asGeoJSON(table, column) {
|
|
173
|
-
return this.knex.raw('sdo_util.to_geojson(??.??) as ??', [table, column, column]);
|
|
174
|
-
}
|
|
175
|
-
fromText(text) {
|
|
176
|
-
return this.knex.raw('sdo_geometry(?, 4326)', text);
|
|
177
|
-
}
|
|
178
|
-
_intersects(key, geojson) {
|
|
179
|
-
const geometry = this.fromGeoJSON(geojson);
|
|
180
|
-
return this.knex.raw(`sdo_overlapbdyintersect(??, ?)`, [key, geometry]);
|
|
181
|
-
}
|
|
182
|
-
_intersects_bbox(key, geojson) {
|
|
183
|
-
const geometry = this.fromGeoJSON(geojson);
|
|
184
|
-
return this.knex.raw(`sdo_overlapbdyintersect(sdo_geom.sdo_mbr(??), sdo_geom.sdo_mbr(?))`, [key, geometry]);
|
|
185
|
-
}
|
|
186
|
-
collect(table, column) {
|
|
187
|
-
return this.knex.raw(`concat('geometrycollection(', listagg(?, ', '), ')'`, this.asText(table, column));
|
|
188
|
-
}
|
|
189
|
-
}
|
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.simpleHash = void 0;
|
|
4
|
-
/**
|
|
5
|
-
* Generate a simple short hash for a given string
|
|
6
|
-
* This is not cryptographically secure in any way, and has a high chance of collision
|
|
7
|
-
*/
|
|
8
|
-
function simpleHash(str) {
|
|
9
|
-
let hash = 0;
|
|
10
|
-
for (let i = 0; i < str.length; hash &= hash) {
|
|
11
|
-
hash = 31 * hash + str.charCodeAt(i++);
|
|
12
|
-
}
|
|
13
|
-
return Math.abs(hash).toString(16);
|
|
14
|
-
}
|
|
15
|
-
exports.simpleHash = simpleHash;
|