mirror of
https://github.com/directus/directus.git
synced 2026-01-29 05:48:14 -05:00
* Step 1 * Step 2 * False sense of confidence * Couple more before dinner * Update schema package * Update format-title * Upgrade specs file * Close * Replace ts-node-dev with tsx, and various others * Replace lodash with lodash-es * Add lodash-es types * Update knex import * More fun is had * FSE * Consolidate repos * Various tweaks and fixes * Fix specs * Remove dependency on knex-schema-inspector * Fix wrong imports of inspector * Move shared exceptions to new package * Move constants to separate module * Move types to new types package * Use directus/types * I believe this is no longer needed * [WIP] Start moving utils to esm * ESMify Shared * Move shared utils to @directus/utils * Use @directus/utils instead of @directus/shared/utils * It runs! * Use correct schemaoverview type * Fix imports * Fix the thing * Start on new update-checker lib * Use new update-check package * Swap out directus/shared in app * Pushing through the last bits now * Dangerously make extensions SDK ESM * Use @directus/types in tests * Copy util function to test * Fix linter config * Add missing import * Hot takes * Fix build * Curse these default exports * No tests in constants * Add tests * Remove tests from types * Add tests for exceptions * Fix test * Fix app tests * Fix import in test * Fix various tests * Fix specs export * Some more tests * Remove broken integration tests These were broken beyond repair.. They were also written before we really knew what we we're doing with tests, so I think it's better to say goodbye and start over with these * Regenerate lockfile * Fix imports from merge * I create my own problems * Make sharp play nice * Add vitest config * Install missing blackbox dep * Consts shouldn't be in types tsk tsk tsk tsk * Fix type/const usage in extensions-sdk * cursed.default * Reduce circular deps * Fix circular dep in items service * vvv * Trigger testing for all vendors * Add workaround for rollup * Prepend the file protocol for the ESM loader to be compatible with Windows "WARN: Only URLs with a scheme in: file and data are supported by the default ESM loader. On Windows, absolute paths must be valid file:// URLs. Received protocol 'c:'" * Fix postgres * Schema package updates Co-authored-by: Azri Kahar <42867097+azrikahar@users.noreply.github.com> * Resolve cjs/mjs extensions * Clean-up eslint config * fixed extension concatination * using string interpolation for consistency * Revert MySQL optimisation * Revert testing for all vendors * Replace tsx with esbuild-kit/esm-loader Is a bit faster and we can rely on the built-in `watch` and `inspect` functionalities of Node.js Note: The possibility to watch other files (.env in our case) might be added in the future, see https://github.com/nodejs/node/issues/45467 * Use exact version for esbuild-kit/esm-loader * Fix import --------- Co-authored-by: ian <licitdev@gmail.com> Co-authored-by: Brainslug <tim@brainslug.nl> Co-authored-by: Azri Kahar <42867097+azrikahar@users.noreply.github.com> Co-authored-by: Pascal Jufer <pascal-jufer@bluewin.ch>
96 lines
2.1 KiB
TypeScript
96 lines
2.1 KiB
TypeScript
import {
|
|
addYears,
|
|
subWeeks,
|
|
subYears,
|
|
addWeeks,
|
|
subMonths,
|
|
addMonths,
|
|
subDays,
|
|
addDays,
|
|
subHours,
|
|
addHours,
|
|
subMinutes,
|
|
addMinutes,
|
|
subSeconds,
|
|
addSeconds,
|
|
addMilliseconds,
|
|
subMilliseconds,
|
|
} from 'date-fns';
|
|
import { clone } from 'lodash-es';
|
|
|
|
/**
|
|
* Adjust a given date by a given change in duration. The adjustment value uses the exact same syntax
|
|
* and logic as Vercel's `ms`.
|
|
*
|
|
* The conversion is lifted straight from `ms`.
|
|
*/
|
|
export function adjustDate(date: Date, adjustment: string): Date | undefined {
|
|
date = clone(date);
|
|
|
|
const subtract = adjustment.startsWith('-');
|
|
|
|
if (subtract || adjustment.startsWith('+')) {
|
|
adjustment = adjustment.substring(1);
|
|
}
|
|
|
|
const match =
|
|
/^(-?(?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|weeks?|w|months?|mth|mo|years?|yrs?|y)?$/i.exec(
|
|
adjustment
|
|
);
|
|
|
|
if (!match || !match[1]) {
|
|
return;
|
|
}
|
|
|
|
const amount = parseFloat(match[1]);
|
|
const type = (match[2] ?? 'days').toLowerCase();
|
|
|
|
switch (type) {
|
|
case 'years':
|
|
case 'year':
|
|
case 'yrs':
|
|
case 'yr':
|
|
case 'y':
|
|
return subtract ? subYears(date, amount) : addYears(date, amount);
|
|
case 'months':
|
|
case 'month':
|
|
case 'mth':
|
|
case 'mo':
|
|
return subtract ? subMonths(date, amount) : addMonths(date, amount);
|
|
case 'weeks':
|
|
case 'week':
|
|
case 'w':
|
|
return subtract ? subWeeks(date, amount) : addWeeks(date, amount);
|
|
case 'days':
|
|
case 'day':
|
|
case 'd':
|
|
return subtract ? subDays(date, amount) : addDays(date, amount);
|
|
case 'hours':
|
|
case 'hour':
|
|
case 'hrs':
|
|
case 'hr':
|
|
case 'h':
|
|
return subtract ? subHours(date, amount) : addHours(date, amount);
|
|
case 'minutes':
|
|
case 'minute':
|
|
case 'mins':
|
|
case 'min':
|
|
case 'm':
|
|
return subtract ? subMinutes(date, amount) : addMinutes(date, amount);
|
|
case 'seconds':
|
|
case 'second':
|
|
case 'secs':
|
|
case 'sec':
|
|
case 's':
|
|
return subtract ? subSeconds(date, amount) : addSeconds(date, amount);
|
|
case 'milliseconds':
|
|
case 'millisecond':
|
|
case 'msecs':
|
|
case 'msec':
|
|
case 'ms':
|
|
return subtract ? subMilliseconds(date, amount) : addMilliseconds(date, amount);
|
|
default:
|
|
return undefined;
|
|
}
|
|
}
|