chore: directus 11.3.3 compatibility

DOCUMENTATION.md

@@ -1,6 +1,6 @@
 # Directus Sync
 
-![Directus 11.3.2](https://img.shields.io/badge/Directus-11.3.2-64f?style=for-the-badge&logo=directus)
+![Directus 11.3.3](https://img.shields.io/badge/Directus-11.3.3-64f?style=for-the-badge&logo=directus)
 
 > [!IMPORTANT]
 > Latest version of `directus-sync` introduces breaking changes and is not compatible with Directus 10.x.x.

README.md

@@ -1,6 +1,6 @@
 # Directus Sync
 
-![Directus 11.3.2](https://img.shields.io/badge/Directus-11.3.2-64f?style=for-the-badge&logo=directus)
+![Directus 11.3.3](https://img.shields.io/badge/Directus-11.3.3-64f?style=for-the-badge&logo=directus)
 [![Donate](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/Directus-Sync/donate)
 [![Discord](https://img.shields.io/badge/Discord-Join-5865F2?style=for-the-badge&logo=discord)](https://discord.gg/4vGzHPQmud)
 

docker/build-and-push.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env zx
 
-const latestDirectusVersion = '11.3.2';
+const latestDirectusVersion = '11.3.3';
 const [major, minor, patch] = latestDirectusVersion.split('.');
 const directusVersions = [
   'latest',

packages/cli/package.json

@@ -33,6 +33,7 @@
   },
   "dependencies": {
     "@directus/sdk": "^17.0.1",
+    "case": "^1.6.3",
     "commander": "^12.1.0",
     "compare-versions": "^6.1.1",
     "deep-object-diff": "^1.1.9",

packages/cli/src/lib/commands/seed/index.ts

@@ -0,0 +1 @@
+export * from './push';

packages/cli/src/lib/commands/seed/push.ts

@@ -0,0 +1,26 @@
+import { Container } from 'typedi';
+import pino from 'pino';
+import { MigrationClient, SeedClient } from '../../services';
+import { LOGGER } from '../../constants';
+
+export async function runSeedPush() {
+  const logger: pino.Logger = Container.get(LOGGER);
+  const seedClient = Container.get(SeedClient);
+
+  // Check and prepare instance
+  const migrationClient = Container.get(MigrationClient);
+  await migrationClient.validateDirectusVersion();
+  await migrationClient.clearCache();
+
+  // Clean up the seed (dangling id maps, etc.)
+  logger.info(`---- Clean up seeds ----`);
+  await seedClient.cleanUp();
+
+  let stop = false;
+  let index = 1;
+  while (!stop) {
+    logger.info(`---- Push: iteration ${index} ----`);
+    stop = !(await seedClient.push()); // Return true when should retry
+    index++;
+  }
+}

packages/cli/src/lib/helpers.ts

@@ -65,6 +65,24 @@ export function loadJsonFilesRecursively<T>(dirPath: string): T[] {
   return files;
 }
 
+/**
+ * Recursively load json files from a directory and validate them against a zod schema
+ * The root path could be a folder or a JSON file
+ */
+export function loadJsonFilesRecursivelyWithSchema<T extends ZodSchema>(
+  rootPath: string,
+  schema: T,
+  errorContext?: string,
+): z.infer<T>[] {
+  if (rootPath.endsWith('.json')) {
+    const file = readJsonSync(rootPath, 'utf-8');
+    return [zodParse(file, schema, errorContext)];
+  }
+  return loadJsonFilesRecursively(rootPath).map((file) =>
+    zodParse(file, schema, errorContext),
+  );
+}
+
 /**
  * Validate an object against a zod schema and format the error if it fails
  */

packages/cli/src/lib/program.ts

@@ -12,6 +12,7 @@
   runRemovePermissionDuplicates,
   runUntrack,
 } from './index';
+import { runSeedPush } from './commands/seed';
 
 /**
  * Remove some default values from the program options that overrides the config file
@@ -209,6 +210,25 @@
     .addOption(forceOption)
     .action(wrapAction(program, runPush));
 
+  // ---------------------------------------------------------------------------------
+  // Seed
+  const seedPathOption = new Option(
+    '--seed-path <seedPath...>',
+    `the base path(s) for the seed (default "${DefaultConfig.seedPath}")`,
+  );
+
+  const seed = program
+    .command('seed')
+    .description('seed the custom collections with data');
+
+  seed
+    .command('push')
+    .description('push the seed data')
+    .addOption(seedPathOption)
+    .action(wrapAction(program, runSeedPush));
+
+  // ---------------------------------------------------------------------------------
+  // Helpers
   const helpers = program
     .command('helpers')
     .description('a set of helper utilities');

packages/cli/src/lib/services/collections/base/id-mapper-client.ts

@@ -88,7 +88,7 @@ export abstract class IdMapperClient extends ExtensionClient {
       `/table/${this.table}`,
       'POST',
       {
-        table: this.table,
+        table: this.table, // TODO: Could remove this (to be tested)
         local_id: localId,
         sync_id: syncId,
       },

packages/cli/src/lib/services/config/config.ts

@@ -75,6 +75,16 @@ export class ConfigService {
     };
   }
 
+  @Cacheable()
+  getSeedConfig() {
+    const paths = this.requireOptions('seedPath');
+    const seedPaths = Array.isArray(paths) ? paths : [paths];
+    const seedFullPaths = seedPaths.map((p) => Path.resolve(p));
+    return {
+      paths: seedFullPaths,
+    };
+  }
+
   /**
    * Returns the Directus config, either with a token or with an email/password
    */