directus 9.6.0 → 9.8.0

package/dist/app.js

@@ -111,9 +111,11 @@ async function createApp() {
             // friendly. Ref #10806
             upgradeInsecureRequests: null,
             // These are required for MapLibre
+            // https://cdn.directus.io is required for images/videos in the official docs
             workerSrc: ["'self'", 'blob:'],
             childSrc: ["'self'", 'blob:'],
-            imgSrc: ["'self'", 'data:', 'blob:'],
+            imgSrc: ["'self'", 'data:', 'blob:', 'https://cdn.directus.io'],
+            mediaSrc: ["'self'", 'https://cdn.directus.io'],
             connectSrc: ["'self'", 'https://*'],
         },
     }, (0, get_config_from_env_1.getConfigFromEnv)('CONTENT_SECURITY_POLICY_'))));

package/dist/auth/drivers/oauth2.js

@@ -18,6 +18,7 @@ const async_handler_1 = __importDefault(require("../../utils/async-handler"));
 const url_1 = require("../../utils/url");
 const logger_1 = __importDefault(require("../../logger"));
 const get_ip_from_req_1 = require("../../utils/get-ip-from-req");
+const get_config_from_env_1 = require("../../utils/get-config-from-env");
 class OAuth2AuthDriver extends local_1.LocalAuthDriver {
     constructor(options, config) {
         super(options, config);
@@ -35,11 +36,13 @@ class OAuth2AuthDriver extends local_1.LocalAuthDriver {
             userinfo_endpoint: profileUrl,
             issuer: additionalConfig.provider,
         });
+        const clientOptionsOverrides = (0, get_config_from_env_1.getConfigFromEnv)(`AUTH_${config.provider.toUpperCase()}_CLIENT_`, [`AUTH_${config.provider.toUpperCase()}_CLIENT_ID`, `AUTH_${config.provider.toUpperCase()}_CLIENT_SECRET`], 'underscore');
         this.client = new issuer.Client({
             client_id: clientId,
             client_secret: clientSecret,
             redirect_uris: [this.redirectUrl],
             response_types: ['code'],
+            ...clientOptionsOverrides,
         });
     }
     generateCodeVerifier() {

package/dist/auth/drivers/openid.js

@@ -18,6 +18,7 @@ const async_handler_1 = __importDefault(require("../../utils/async-handler"));
 const url_1 = require("../../utils/url");
 const logger_1 = __importDefault(require("../../logger"));
 const get_ip_from_req_1 = require("../../utils/get-ip-from-req");
+const get_config_from_env_1 = require("../../utils/get-config-from-env");
 class OpenIDAuthDriver extends local_1.LocalAuthDriver {
     constructor(options, config) {
         super(options, config);
@@ -26,6 +27,7 @@ class OpenIDAuthDriver extends local_1.LocalAuthDriver {
             throw new exceptions_1.InvalidConfigException('Invalid provider config', { provider: additionalConfig.provider });
         }
         const redirectUrl = new url_1.Url(env_1.default.PUBLIC_URL).addPath('auth', 'login', additionalConfig.provider, 'callback');
+        const clientOptionsOverrides = (0, get_config_from_env_1.getConfigFromEnv)(`AUTH_${config.provider.toUpperCase()}_CLIENT_`, [`AUTH_${config.provider.toUpperCase()}_CLIENT_ID`, `AUTH_${config.provider.toUpperCase()}_CLIENT_SECRET`], 'underscore');
         this.redirectUrl = redirectUrl.toString();
         this.usersService = new services_1.UsersService({ knex: this.knex, schema: this.schema });
         this.config = additionalConfig;
@@ -43,6 +45,7 @@ class OpenIDAuthDriver extends local_1.LocalAuthDriver {
                     client_secret: clientSecret,
                     redirect_uris: [this.redirectUrl],
                     response_types: ['code'],
+                    ...clientOptionsOverrides,
                 }));
             })
                 .catch(reject);

package/dist/cache.d.ts

@@ -2,5 +2,8 @@ import Keyv from 'keyv';
 export declare function getCache(): {
     cache: Keyv | null;
     systemCache: Keyv;
+    lockCache: Keyv;
 };
-export declare function flushCaches(): Promise<void>;
+export declare function flushCaches(forced?: boolean): Promise<void>;
+export declare function clearSystemCache(forced?: boolean): Promise<void>;
+export declare function setSystemCache(key: string, value: any, ttl?: number): Promise<void>;

package/dist/cache.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.flushCaches = exports.getCache = void 0;
+exports.setSystemCache = exports.clearSystemCache = exports.flushCaches = exports.getCache = void 0;
 const keyv_1 = __importDefault(require("keyv"));
 const ms_1 = __importDefault(require("ms"));
 const env_1 = __importDefault(require("./env"));
@@ -12,25 +12,47 @@ const get_config_from_env_1 = require("./utils/get-config-from-env");
 const validate_env_1 = require("./utils/validate-env");
 let cache = null;
 let systemCache = null;
+let lockCache = null;
 function getCache() {
     if (env_1.default.CACHE_ENABLED === true && cache === null) {
         (0, validate_env_1.validateEnv)(['CACHE_NAMESPACE', 'CACHE_TTL', 'CACHE_STORE']);
-        cache = getKeyvInstance((0, ms_1.default)(env_1.default.CACHE_TTL));
+        cache = getKeyvInstance(env_1.default.CACHE_TTL ? (0, ms_1.default)(env_1.default.CACHE_TTL) : undefined);
         cache.on('error', (err) => logger_1.default.warn(err, `[cache] ${err}`));
     }
     if (systemCache === null) {
-        systemCache = getKeyvInstance(undefined, '_system');
+        systemCache = getKeyvInstance(env_1.default.CACHE_SYSTEM_TTL ? (0, ms_1.default)(env_1.default.CACHE_SYSTEM_TTL) : undefined, '_system');
         systemCache.on('error', (err) => logger_1.default.warn(err, `[cache] ${err}`));
     }
-    return { cache, systemCache };
+    if (lockCache === null) {
+        lockCache = getKeyvInstance(undefined, '_lock');
+        lockCache.on('error', (err) => logger_1.default.warn(err, `[cache] ${err}`));
+    }
+    return { cache, systemCache, lockCache };
 }
 exports.getCache = getCache;
-async function flushCaches() {
-    const { systemCache, cache } = getCache();
-    await (systemCache === null || systemCache === void 0 ? void 0 : systemCache.clear());
+async function flushCaches(forced) {
+    const { cache } = getCache();
+    await clearSystemCache(forced);
     await (cache === null || cache === void 0 ? void 0 : cache.clear());
 }
 exports.flushCaches = flushCaches;
+async function clearSystemCache(forced) {
+    const { systemCache, lockCache } = getCache();
+    // Flush system cache when forced or when system cache lock not set
+    if (forced || !(await lockCache.get('system-cache-lock'))) {
+        await lockCache.set('system-cache-lock', true, 10000);
+        await systemCache.clear();
+        await lockCache.delete('system-cache-lock');
+    }
+}
+exports.clearSystemCache = clearSystemCache;
+async function setSystemCache(key, value, ttl) {
+    const { systemCache, lockCache } = getCache();
+    if (!(await lockCache.get('system-cache-lock'))) {
+        await systemCache.set(key, value, ttl);
+    }
+}
+exports.setSystemCache = setSystemCache;
 function getKeyvInstance(ttl, namespaceSuffix) {
     switch (env_1.default.CACHE_STORE) {
         case 'redis':

package/dist/cli/commands/schema/apply.d.ts

@@ -1,3 +1,4 @@
 export declare function apply(snapshotPath: string, options?: {
     yes: boolean;
+    dryRun: boolean;
 }): Promise<void>;

package/dist/cli/commands/schema/apply.js

@@ -63,7 +63,9 @@ async function apply(snapshotPath, options) {
             database.destroy();
             process.exit(0);
         }
-        if ((options === null || options === void 0 ? void 0 : options.yes) !== true) {
+        const dryRun = (options === null || options === void 0 ? void 0 : options.dryRun) === true;
+        const promptForChanges = !dryRun && (options === null || options === void 0 ? void 0 : options.yes) !== true;
+        if (dryRun || promptForChanges) {
             let message = '';
             if (snapshotDiff.collections.length > 0) {
                 message += chalk_1.default.black.underline.bold('Collections:');
@@ -141,14 +143,16 @@ async function apply(snapshotPath, options) {
                     }
                 }
             }
+            message += 'The following changes will be applied:\n\n' + chalk_1.default.black(message);
+            if (dryRun) {
+                logger_1.default.info(message);
+                process.exit(0);
+            }
             const { proceed } = await inquirer_1.default.prompt([
                 {
                     type: 'confirm',
                     name: 'proceed',
-                    message: 'The following changes will be applied:\n\n' +
-                        chalk_1.default.black(message) +
-                        '\n\n' +
-                        'Would you like to continue?',
+                    message: message + '\n\n' + 'Would you like to continue?',
                 },
             ]);
             if (proceed === false) {

package/dist/cli/index.js

@@ -81,6 +81,7 @@ async function createCli() {
         .command('apply')
         .description('Apply a snapshot file to the current database')
         .option('-y, --yes', `Assume "yes" as answer to all prompts and run non-interactively`)
+        .option('-d, --dry-run', 'Plan and log changes to be applied', false)
         .argument('<path>', 'Path to snapshot file')
         .action(apply_1.apply);
     await emitter_1.default.emitInit('cli.after', { program });

package/dist/controllers/assets.js

@@ -14,6 +14,9 @@ const use_collection_1 = __importDefault(require("../middleware/use-collection")
 const services_1 = require("../services");
 const assets_1 = require("../types/assets");
 const async_handler_1 = __importDefault(require("../utils/async-handler"));
+const helmet_1 = __importDefault(require("helmet"));
+const lodash_2 = require("lodash");
+const get_config_from_env_1 = require("../utils/get-config-from-env");
 const router = (0, express_1.Router)();
 router.use((0, use_collection_1.default)('directus_files'));
 router.get('/:pk', 
@@ -88,7 +91,12 @@ router.get('/:pk',
             return next();
         throw new exceptions_1.InvalidQueryException(`Dynamic asset generation has been disabled for this project.`);
     }
-}), 
+}), helmet_1.default.contentSecurityPolicy((0, lodash_2.merge)({
+    useDefaults: false,
+    directives: {
+        defaultSrc: ['none'],
+    },
+}, (0, get_config_from_env_1.getConfigFromEnv)('ASSETS_CONTENT_SECURITY_POLICY'))), 
 // Return file
 (0, async_handler_1.default)(async (req, res) => {
     var _a, _b;

package/dist/controllers/utils.js

@@ -95,12 +95,29 @@ router.post('/import/:collection', collection_exists_1.default, (0, async_handle
     busboy.on('error', (err) => next(err));
     req.pipe(busboy);
 }));
+router.post('/export/:collection', collection_exists_1.default, (0, async_handler_1.default)(async (req, res, next) => {
+    if (!req.body.query) {
+        throw new exceptions_1.InvalidPayloadException(`"query" is required.`);
+    }
+    if (!req.body.format) {
+        throw new exceptions_1.InvalidPayloadException(`"format" is required.`);
+    }
+    const service = new services_1.ExportService({
+        accountability: req.accountability,
+        schema: req.schema,
+    });
+    // We're not awaiting this, as it's supposed to run async in the background
+    service.exportToFile(req.params.collection, req.body.query, req.body.format, {
+        file: req.body.file,
+    });
+    return next();
+}), respond_1.respond);
 router.post('/cache/clear', (0, async_handler_1.default)(async (req, res) => {
     var _a;
     if (((_a = req.accountability) === null || _a === void 0 ? void 0 : _a.admin) !== true) {
         throw new exceptions_1.ForbiddenException();
     }
-    await (0, cache_1.flushCaches)();
+    await (0, cache_1.flushCaches)(true);
     res.status(200).end();
 }));
 exports.default = router;

package/dist/database/helpers/date/dialects/default.d.ts

@@ -0,0 +1,3 @@
+import { DateHelper } from '../types';
+export declare class DateHelperDefault extends DateHelper {
+}

package/dist/database/helpers/date/dialects/default.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DateHelperDefault = void 0;
+const types_1 = require("../types");
+class DateHelperDefault extends types_1.DateHelper {
+}
+exports.DateHelperDefault = DateHelperDefault;

package/dist/database/helpers/date/dialects/sqlite.d.ts

@@ -1,13 +1,4 @@
 import { DateHelper } from '../types';
-import { Knex } from 'knex';
 export declare class DateHelperSQLite extends DateHelper {
-    year(table: string, column: string): Knex.Raw;
-    month(table: string, column: string): Knex.Raw;
-    week(table: string, column: string): Knex.Raw;
-    day(table: string, column: string): Knex.Raw;
-    weekday(table: string, column: string): Knex.Raw;
-    hour(table: string, column: string): Knex.Raw;
-    minute(table: string, column: string): Knex.Raw;
-    second(table: string, column: string): Knex.Raw;
     parse(date: string): string;
 }

package/dist/database/helpers/date/dialects/sqlite.js

@@ -3,30 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DateHelperSQLite = void 0;
 const types_1 = require("../types");
 class DateHelperSQLite extends types_1.DateHelper {
-    year(table, column) {
-        return this.knex.raw("strftime('%Y', ??.?? / 1000, 'unixepoch')", [table, column]);
-    }
-    month(table, column) {
-        return this.knex.raw("strftime('%m', ??.?? / 1000, 'unixepoch')", [table, column]);
-    }
-    week(table, column) {
-        return this.knex.raw("strftime('%W', ??.?? / 1000, 'unixepoch')", [table, column]);
-    }
-    day(table, column) {
-        return this.knex.raw("strftime('%d', ??.?? / 1000, 'unixepoch')", [table, column]);
-    }
-    weekday(table, column) {
-        return this.knex.raw("strftime('%w', ??.?? / 1000, 'unixepoch')", [table, column]);
-    }
-    hour(table, column) {
-        return this.knex.raw("strftime('%H', ??.?? / 1000, 'unixepoch')", [table, column]);
-    }
-    minute(table, column) {
-        return this.knex.raw("strftime('%M', ??.?? / 1000, 'unixepoch')", [table, column]);
-    }
-    second(table, column) {
-        return this.knex.raw("strftime('%S', ??.?? / 1000, 'unixepoch')", [table, column]);
-    }
     parse(date) {
         const newDate = new Date(date);
         return (newDate.getTime() - newDate.getTimezoneOffset() * 60 * 1000).toString();

package/dist/database/helpers/date/index.d.ts

@@ -1,7 +1,7 @@
-export { DateHelperPostgres as postgres } from './dialects/postgres';
-export { DateHelperPostgres as redshift } from './dialects/postgres';
-export { DateHelperPostgres as cockroachdb } from './dialects/postgres';
-export { DateHelperOracle as oracle } from './dialects/oracle';
+export { DateHelperDefault as postgres } from './dialects/default';
+export { DateHelperDefault as redshift } from './dialects/default';
+export { DateHelperDefault as cockroachdb } from './dialects/default';
+export { DateHelperDefault as oracle } from './dialects/default';
+export { DateHelperDefault as mysql } from './dialects/default';
+export { DateHelperDefault as mssql } from './dialects/default';
 export { DateHelperSQLite as sqlite } from './dialects/sqlite';
-export { DateHelperMySQL as mysql } from './dialects/mysql';
-export { DateHelperMSSQL as mssql } from './dialects/mssql';

package/dist/database/helpers/date/index.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mssql = exports.mysql = exports.sqlite = exports.oracle = exports.cockroachdb = exports.redshift = exports.postgres = void 0;
-var postgres_1 = require("./dialects/postgres");
-Object.defineProperty(exports, "postgres", { enumerable: true, get: function () { return postgres_1.DateHelperPostgres; } });
-var postgres_2 = require("./dialects/postgres");
-Object.defineProperty(exports, "redshift", { enumerable: true, get: function () { return postgres_2.DateHelperPostgres; } });
-var postgres_3 = require("./dialects/postgres");
-Object.defineProperty(exports, "cockroachdb", { enumerable: true, get: function () { return postgres_3.DateHelperPostgres; } });
-var oracle_1 = require("./dialects/oracle");
-Object.defineProperty(exports, "oracle", { enumerable: true, get: function () { return oracle_1.DateHelperOracle; } });
+exports.sqlite = exports.mssql = exports.mysql = exports.oracle = exports.cockroachdb = exports.redshift = exports.postgres = void 0;
+var default_1 = require("./dialects/default");
+Object.defineProperty(exports, "postgres", { enumerable: true, get: function () { return default_1.DateHelperDefault; } });
+var default_2 = require("./dialects/default");
+Object.defineProperty(exports, "redshift", { enumerable: true, get: function () { return default_2.DateHelperDefault; } });
+var default_3 = require("./dialects/default");
+Object.defineProperty(exports, "cockroachdb", { enumerable: true, get: function () { return default_3.DateHelperDefault; } });
+var default_4 = require("./dialects/default");
+Object.defineProperty(exports, "oracle", { enumerable: true, get: function () { return default_4.DateHelperDefault; } });
+var default_5 = require("./dialects/default");
+Object.defineProperty(exports, "mysql", { enumerable: true, get: function () { return default_5.DateHelperDefault; } });
+var default_6 = require("./dialects/default");
+Object.defineProperty(exports, "mssql", { enumerable: true, get: function () { return default_6.DateHelperDefault; } });
 var sqlite_1 = require("./dialects/sqlite");
 Object.defineProperty(exports, "sqlite", { enumerable: true, get: function () { return sqlite_1.DateHelperSQLite; } });
-var mysql_1 = require("./dialects/mysql");
-Object.defineProperty(exports, "mysql", { enumerable: true, get: function () { return mysql_1.DateHelperMySQL; } });
-var mssql_1 = require("./dialects/mssql");
-Object.defineProperty(exports, "mssql", { enumerable: true, get: function () { return mssql_1.DateHelperMSSQL; } });

package/dist/database/helpers/date/types.d.ts

@@ -1,13 +1,4 @@
 import { DatabaseHelper } from '../types';
-import { Knex } from 'knex';
 export declare abstract class DateHelper extends DatabaseHelper {
-    abstract year(table: string, column: string): Knex.Raw;
-    abstract month(table: string, column: string): Knex.Raw;
-    abstract week(table: string, column: string): Knex.Raw;
-    abstract day(table: string, column: string): Knex.Raw;
-    abstract weekday(table: string, column: string): Knex.Raw;
-    abstract hour(table: string, column: string): Knex.Raw;
-    abstract minute(table: string, column: string): Knex.Raw;
-    abstract second(table: string, column: string): Knex.Raw;
     parse(date: string): string;
 }

package/dist/database/helpers/{date → fn}/dialects/mssql.d.ts

@@ -1,6 +1,6 @@
-import { DateHelper } from '../types';
+import { FnHelper } from '../types';
 import { Knex } from 'knex';
-export declare class DateHelperMSSQL extends DateHelper {
+export declare class FnHelperMSSQL extends FnHelper {
     year(table: string, column: string): Knex.Raw;
     month(table: string, column: string): Knex.Raw;
     week(table: string, column: string): Knex.Raw;
@@ -9,4 +9,5 @@ export declare class DateHelperMSSQL extends DateHelper {
     hour(table: string, column: string): Knex.Raw;
     minute(table: string, column: string): Knex.Raw;
     second(table: string, column: string): Knex.Raw;
+    count(table: string, column: string): Knex.Raw<any>;
 }

package/dist/database/helpers/{date → fn}/dialects/mssql.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DateHelperMSSQL = void 0;
+exports.FnHelperMSSQL = void 0;
 const types_1 = require("../types");
-class DateHelperMSSQL extends types_1.DateHelper {
+class FnHelperMSSQL extends types_1.FnHelper {
     year(table, column) {
         return this.knex.raw('DATEPART(year, ??.??)', [table, column]);
     }
@@ -27,5 +27,16 @@ class DateHelperMSSQL extends types_1.DateHelper {
     second(table, column) {
         return this.knex.raw('DATEPART(second, ??.??)', [table, column]);
     }
+    count(table, column) {
+        var _a, _b, _c, _d, _e;
+        const type = (_e = (_d = (_c = (_b = (_a = this.schema.collections) === null || _a === void 0 ? void 0 : _a[table]) === null || _b === void 0 ? void 0 : _b.fields) === null || _c === void 0 ? void 0 : _c[column]) === null || _d === void 0 ? void 0 : _d.type) !== null && _e !== void 0 ? _e : 'unknown';
+        if (type === 'json') {
+            return this.knex.raw(`(SELECT COUNT(*) FROM OPENJSON(??.??, '$'))`, [table, column]);
+        }
+        if (type === 'alias') {
+            return this._relationalCount(table, column);
+        }
+        throw new Error(`Couldn't extract type from ${table}.${column}`);
+    }
 }
-exports.DateHelperMSSQL = DateHelperMSSQL;
+exports.FnHelperMSSQL = FnHelperMSSQL;

package/dist/database/helpers/{date → fn}/dialects/mysql.d.ts

@@ -1,6 +1,6 @@
-import { DateHelper } from '../types';
+import { FnHelper } from '../types';
 import { Knex } from 'knex';
-export declare class DateHelperMySQL extends DateHelper {
+export declare class FnHelperMySQL extends FnHelper {
     year(table: string, column: string): Knex.Raw;
     month(table: string, column: string): Knex.Raw;
     week(table: string, column: string): Knex.Raw;
@@ -9,4 +9,5 @@ export declare class DateHelperMySQL extends DateHelper {
     hour(table: string, column: string): Knex.Raw;
     minute(table: string, column: string): Knex.Raw;
     second(table: string, column: string): Knex.Raw;
+    count(table: string, column: string): Knex.Raw;
 }

package/dist/database/helpers/{date → fn}/dialects/mysql.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DateHelperMySQL = void 0;
+exports.FnHelperMySQL = void 0;
 const types_1 = require("../types");
-class DateHelperMySQL extends types_1.DateHelper {
+class FnHelperMySQL extends types_1.FnHelper {
     year(table, column) {
         return this.knex.raw('YEAR(??.??)', [table, column]);
     }
@@ -27,5 +27,16 @@ class DateHelperMySQL extends types_1.DateHelper {
     second(table, column) {
         return this.knex.raw('SECOND(??.??)', [table, column]);
     }
+    count(table, column) {
+        var _a, _b, _c, _d, _e;
+        const type = (_e = (_d = (_c = (_b = (_a = this.schema.collections) === null || _a === void 0 ? void 0 : _a[table]) === null || _b === void 0 ? void 0 : _b.fields) === null || _c === void 0 ? void 0 : _c[column]) === null || _d === void 0 ? void 0 : _d.type) !== null && _e !== void 0 ? _e : 'unknown';
+        if (type === 'json') {
+            return this.knex.raw('JSON_LENGTH(??.??)', [table, column]);
+        }
+        if (type === 'alias') {
+            return this._relationalCount(table, column);
+        }
+        throw new Error(`Couldn't extract type from ${table}.${column}`);
+    }
 }
-exports.DateHelperMySQL = DateHelperMySQL;
+exports.FnHelperMySQL = FnHelperMySQL;

package/dist/database/helpers/{date → fn}/dialects/oracle.d.ts

@@ -1,6 +1,6 @@
-import { DateHelper } from '../types';
+import { FnHelper } from '../types';
 import { Knex } from 'knex';
-export declare class DateHelperOracle extends DateHelper {
+export declare class FnHelperOracle extends FnHelper {
     year(table: string, column: string): Knex.Raw;
     month(table: string, column: string): Knex.Raw;
     week(table: string, column: string): Knex.Raw;
@@ -9,4 +9,5 @@ export declare class DateHelperOracle extends DateHelper {
     hour(table: string, column: string): Knex.Raw;
     minute(table: string, column: string): Knex.Raw;
     second(table: string, column: string): Knex.Raw;
+    count(table: string, column: string): Knex.Raw<any>;
 }

package/dist/database/helpers/{date → fn}/dialects/oracle.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DateHelperOracle = void 0;
+exports.FnHelperOracle = void 0;
 const types_1 = require("../types");
-class DateHelperOracle extends types_1.DateHelper {
+class FnHelperOracle extends types_1.FnHelper {
     year(table, column) {
         return this.knex.raw("TO_CHAR(??.??, 'IYYY')", [table, column]);
     }
@@ -27,5 +27,16 @@ class DateHelperOracle extends types_1.DateHelper {
     second(table, column) {
         return this.knex.raw("TO_CHAR(??.??, 'SS')", [table, column]);
     }
+    count(table, column) {
+        var _a, _b, _c, _d, _e;
+        const type = (_e = (_d = (_c = (_b = (_a = this.schema.collections) === null || _a === void 0 ? void 0 : _a[table]) === null || _b === void 0 ? void 0 : _b.fields) === null || _c === void 0 ? void 0 : _c[column]) === null || _d === void 0 ? void 0 : _d.type) !== null && _e !== void 0 ? _e : 'unknown';
+        if (type === 'json') {
+            return this.knex.raw("json_value(??.??, '$.size()')", [table, column]);
+        }
+        if (type === 'alias') {
+            return this._relationalCount(table, column);
+        }
+        throw new Error(`Couldn't extract type from ${table}.${column}`);
+    }
 }
-exports.DateHelperOracle = DateHelperOracle;
+exports.FnHelperOracle = FnHelperOracle;

package/dist/database/helpers/{date → fn}/dialects/postgres.d.ts

@@ -1,6 +1,6 @@
-import { DateHelper } from '../types';
+import { FnHelper } from '../types';
 import { Knex } from 'knex';
-export declare class DateHelperPostgres extends DateHelper {
+export declare class FnHelperPostgres extends FnHelper {
     year(table: string, column: string): Knex.Raw;
     month(table: string, column: string): Knex.Raw;
     week(table: string, column: string): Knex.Raw;
@@ -9,4 +9,5 @@ export declare class DateHelperPostgres extends DateHelper {
     hour(table: string, column: string): Knex.Raw;
     minute(table: string, column: string): Knex.Raw;
     second(table: string, column: string): Knex.Raw;
+    count(table: string, column: string): Knex.Raw;
 }

package/dist/database/helpers/{date → fn}/dialects/postgres.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DateHelperPostgres = void 0;
+exports.FnHelperPostgres = void 0;
 const types_1 = require("../types");
-class DateHelperPostgres extends types_1.DateHelper {
+class FnHelperPostgres extends types_1.FnHelper {
     year(table, column) {
         return this.knex.raw('EXTRACT(YEAR FROM ??.??)', [table, column]);
     }
@@ -27,5 +27,16 @@ class DateHelperPostgres extends types_1.DateHelper {
     second(table, column) {
         return this.knex.raw('EXTRACT(SECOND FROM ??.??)', [table, column]);
     }
+    count(table, column) {
+        var _a, _b, _c, _d, _e;
+        const type = (_e = (_d = (_c = (_b = (_a = this.schema.collections) === null || _a === void 0 ? void 0 : _a[table]) === null || _b === void 0 ? void 0 : _b.fields) === null || _c === void 0 ? void 0 : _c[column]) === null || _d === void 0 ? void 0 : _d.type) !== null && _e !== void 0 ? _e : 'unknown';
+        if (type === 'json') {
+            return this.knex.raw('json_array_length(??.??)', [table, column]);
+        }
+        if (type === 'alias') {
+            return this._relationalCount(table, column);
+        }
+        throw new Error(`Couldn't extract type from ${table}.${column}`);
+    }
 }
-exports.DateHelperPostgres = DateHelperPostgres;
+exports.FnHelperPostgres = FnHelperPostgres;

package/dist/database/helpers/fn/dialects/sqlite.d.ts

@@ -0,0 +1,13 @@
+import { FnHelper } from '../types';
+import { Knex } from 'knex';
+export declare class FnHelperSQLite extends FnHelper {
+    year(table: string, column: string): Knex.Raw;
+    month(table: string, column: string): Knex.Raw;
+    week(table: string, column: string): Knex.Raw;
+    day(table: string, column: string): Knex.Raw;
+    weekday(table: string, column: string): Knex.Raw;
+    hour(table: string, column: string): Knex.Raw;
+    minute(table: string, column: string): Knex.Raw;
+    second(table: string, column: string): Knex.Raw;
+    count(table: string, column: string): Knex.Raw<any>;
+}

package/dist/database/helpers/fn/dialects/sqlite.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FnHelperSQLite = void 0;
+const types_1 = require("../types");
+class FnHelperSQLite extends types_1.FnHelper {
+    year(table, column) {
+        return this.knex.raw("CAST(strftime('%Y', ??.?? / 1000, 'unixepoch') AS INTEGER)", [table, column]);
+    }
+    month(table, column) {
+        return this.knex.raw("CAST(strftime('%m', ??.?? / 1000, 'unixepoch') AS INTEGER)", [table, column]);
+    }
+    week(table, column) {
+        return this.knex.raw("CAST(strftime('%W', ??.?? / 1000, 'unixepoch') AS INTEGER)", [table, column]);
+    }
+    day(table, column) {
+        return this.knex.raw("CAST(strftime('%d', ??.?? / 1000, 'unixepoch') AS INTEGER)", [table, column]);
+    }
+    weekday(table, column) {
+        return this.knex.raw("CAST(strftime('%w', ??.?? / 1000, 'unixepoch') AS INTEGER)", [table, column]);
+    }
+    hour(table, column) {
+        return this.knex.raw("CAST(strftime('%H', ??.?? / 1000, 'unixepoch') AS INTEGER)", [table, column]);
+    }
+    minute(table, column) {
+        return this.knex.raw("CAST(strftime('%M', ??.?? / 1000, 'unixepoch') AS INTEGER)", [table, column]);
+    }
+    second(table, column) {
+        return this.knex.raw("CAST(strftime('%S', ??.?? / 1000, 'unixepoch') AS INTEGER)", [table, column]);
+    }
+    count(table, column) {
+        var _a, _b, _c, _d, _e;
+        const type = (_e = (_d = (_c = (_b = (_a = this.schema.collections) === null || _a === void 0 ? void 0 : _a[table]) === null || _b === void 0 ? void 0 : _b.fields) === null || _c === void 0 ? void 0 : _c[column]) === null || _d === void 0 ? void 0 : _d.type) !== null && _e !== void 0 ? _e : 'unknown';
+        if (type === 'json') {
+            return this.knex.raw(`json_array_length(??.??, '$')`, [table, column]);
+        }
+        if (type === 'alias') {
+            return this._relationalCount(table, column);
+        }
+        throw new Error(`Couldn't extract type from ${table}.${column}`);
+    }
+}
+exports.FnHelperSQLite = FnHelperSQLite;

package/dist/database/helpers/fn/index.d.ts

@@ -0,0 +1,7 @@
+export { FnHelperPostgres as postgres } from './dialects/postgres';
+export { FnHelperPostgres as redshift } from './dialects/postgres';
+export { FnHelperPostgres as cockroachdb } from './dialects/postgres';
+export { FnHelperOracle as oracle } from './dialects/oracle';
+export { FnHelperSQLite as sqlite } from './dialects/sqlite';
+export { FnHelperMySQL as mysql } from './dialects/mysql';
+export { FnHelperMSSQL as mssql } from './dialects/mssql';

package/dist/database/helpers/fn/index.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mssql = exports.mysql = exports.sqlite = exports.oracle = exports.cockroachdb = exports.redshift = exports.postgres = void 0;
+var postgres_1 = require("./dialects/postgres");
+Object.defineProperty(exports, "postgres", { enumerable: true, get: function () { return postgres_1.FnHelperPostgres; } });
+var postgres_2 = require("./dialects/postgres");
+Object.defineProperty(exports, "redshift", { enumerable: true, get: function () { return postgres_2.FnHelperPostgres; } });
+var postgres_3 = require("./dialects/postgres");
+Object.defineProperty(exports, "cockroachdb", { enumerable: true, get: function () { return postgres_3.FnHelperPostgres; } });
+var oracle_1 = require("./dialects/oracle");
+Object.defineProperty(exports, "oracle", { enumerable: true, get: function () { return oracle_1.FnHelperOracle; } });
+var sqlite_1 = require("./dialects/sqlite");
+Object.defineProperty(exports, "sqlite", { enumerable: true, get: function () { return sqlite_1.FnHelperSQLite; } });
+var mysql_1 = require("./dialects/mysql");
+Object.defineProperty(exports, "mysql", { enumerable: true, get: function () { return mysql_1.FnHelperMySQL; } });
+var mssql_1 = require("./dialects/mssql");
+Object.defineProperty(exports, "mssql", { enumerable: true, get: function () { return mssql_1.FnHelperMSSQL; } });