Merge pull request #75 from tractr/next

* fix(cli): remove short options for helpers that may conflict

* feat(cli): add option to preserve ids on specific collections (#74)

README.md

@@ -18,45 +18,43 @@ for targeted updates and clearer oversight of your Directus configurations.
 **Table of Contents**
 
 <!-- TOC -->
-
 * [Directus Sync](#directus-sync)
-    * [Requirements](#requirements)
-    * [Usage](#usage)
-        * [Commands](#commands)
-            * [Pull](#pull)
-            * [Diff](#diff)
-            * [Push](#push)
-        * [Available options](#available-options)
-            * [CLI and environment variables](#cli-and-environment-variables)
-            * [Configuration file](#configuration-file)
-            * [Collections hooks](#collections-hooks)
-                * [Simple example](#simple-example)
-                * [Filtering out elements](#filtering-out-elements)
-                * [Using the Directus client](#using-the-directus-client)
-            * [Snapshot hooks](#snapshot-hooks)
-        * [Helpers](#helpers)
-            * [Untrack](#untrack)
-            * [Remove permission duplicates](#remove-permission-duplicates)
-        * [Lifecycle & hooks](#lifecycle--hooks)
-            * [`Pull` command](#pull-command)
-            * [`Diff` command](#diff-command)
-            * [`Push` command](#push-command)
-        * [Tracked Elements](#tracked-elements)
-            * [Roles](#roles)
-            * [Presets](#presets)
-        * [Dependency: `directus-extension-sync`](#dependency-directus-extension-sync)
-            * [Installation](#installation)
-    * [How It Works](#how-it-works)
-        * [Tagging and Tracking](#tagging-and-tracking)
-        * [Mapping Table](#mapping-table)
-        * [Synchronization Process](#synchronization-process)
-        * [Schema Management](#schema-management)
-        * [Non-Tracked Elements and Ignored Fields](#non-tracked-elements-and-ignored-fields)
-        * [Strengths of `directus-sync`](#strengths-of-directus-sync)
-    * [Directus upgrades](#directus-upgrades)
-    * [Use Cases](#use-cases)
-    * [Troubleshooting](#troubleshooting)
-
+  * [Requirements](#requirements)
+  * [Usage](#usage)
+    * [Commands](#commands)
+      * [Pull](#pull)
+      * [Diff](#diff)
+      * [Push](#push)
+    * [Available options](#available-options)
+      * [CLI and environment variables](#cli-and-environment-variables)
+      * [Configuration file](#configuration-file)
+      * [Collections hooks](#collections-hooks)
+        * [Simple example](#simple-example)
+        * [Filtering out elements](#filtering-out-elements)
+        * [Using the Directus client](#using-the-directus-client)
+      * [Snapshot hooks](#snapshot-hooks)
+    * [Helpers](#helpers)
+      * [Untrack](#untrack)
+      * [Remove permission duplicates](#remove-permission-duplicates)
+    * [Lifecycle & hooks](#lifecycle--hooks)
+      * [`Pull` command](#pull-command)
+      * [`Diff` command](#diff-command)
+      * [`Push` command](#push-command)
+    * [Tracked Elements](#tracked-elements)
+      * [Roles](#roles)
+      * [Presets](#presets)
+    * [Dependency: `directus-extension-sync`](#dependency-directus-extension-sync)
+      * [Installation](#installation)
+  * [How It Works](#how-it-works)
+    * [Tagging and Tracking](#tagging-and-tracking)
+    * [Mapping Table](#mapping-table)
+    * [Synchronization Process](#synchronization-process)
+    * [Schema Management](#schema-management)
+    * [Non-Tracked Elements and Ignored Fields](#non-tracked-elements-and-ignored-fields)
+    * [Strengths of `directus-sync`](#strengths-of-directus-sync)
+  * [Directus upgrades](#directus-upgrades)
+  * [Use Cases](#use-cases)
+  * [Troubleshooting](#troubleshooting)
 <!-- TOC -->
 
 ## Requirements
@@ -123,7 +121,7 @@ Options are merged from the following sources, in order of precedence:
 
 These options can be used with any command to configure the operation of `directus-sync`:
 
-- `-c, --config-path <configPath>`
+- `-c, --config-path <configPath>`  
   Change the path to the config file. Default paths are: `./directus-sync.config.js`, `./directus-sync.config.cjs` or
   `./directus-sync.config.json`.
 
@@ -141,7 +139,7 @@ These options can be used with any command to configure the operation of `direct
 - `-e, --directus-email <directusEmail> `  
   Provide the Directus email. Alternatively, set the `DIRECTUS_ADMIN_EMAIL` environment variable.
 
-- `-p, --directus-password <directusPassword>`
+- `-p, --directus-password <directusPassword>`  
   Provide the Directus password. Alternatively, set the `DIRECTUS_ADMIN_PASSWORD` environment variable.
 
 - `--dump-path <dumpPath>`  
@@ -151,17 +149,23 @@ These options can be used with any command to configure the operation of `direct
 - `--collections-path <collectionPath>`  
   Specify the path for the collections dump, relative to the dump path. The default is `"collections"`.
 
-- `-o, --only-collections <onlyCollections>`
+- `-o, --only-collections <onlyCollections>`  
   Comma-separated list of directus collections to include during `pull` `push` or `diff` process.
 
 - `-x, --exclude-collections <excludeCollections>`  
   Comma-separated list of directus collections to exclude during `pull` `push` or `diff`. Can be used along
   with `only-collections`.
 
+- `--preserve-ids <preserveIds>`  
+  Comma-separated list of directus collections to preserve the original ids during the `pull` or `push` process.  
+  Possible collections are: `dashboards`, `operations`, `panels`, `roles` and `translations`.  
+  `flows` and `folders` ids are always preserved.  
+  The value can be `*` or `all` to preserve ids of all collections, when applicable.
+
 - `--snapshot-path <snapshotPath>`  
   Specify the path for the schema snapshot dump, relative to the dump path. The default is `"snapshot"`.
 
-- `--no-snapshot`
+- `--no-snapshot`  
   Do not pull and push the Directus schema. By default, the schema is pulled and pushed.
 
 - `--no-split`  
@@ -205,6 +209,7 @@ module.exports = {
   collectionsPath: 'collections',
   onlyCollections: ['roles', 'permissions', 'settings'],
   excludeCollections: ['settings'],
+  preserveIds: ['roles', 'panels'], // can be '*' or 'all' to preserve all ids, or an array of collections
   snapshotPath: 'snapshot',
   snapshot: true,
   split: true,
@@ -539,6 +544,12 @@ maintaining the integrity and links between different entities.
 > The original IDs of the folders are preserved to maintain the associations with fields of the `file` and `image`
 > types.
 
+> [!TIP]
+> You can use the `--preserve-ids` option to preserve the original ids of some collections.
+> Eligible collections are collections using UUID: `dashboards`, `operations`, `panels`, `roles` and `translations`.
+> If you have already used the `pull` command, you may use the `untrack` helper to remove the id tracking of an element
+> before using this option.
+
 ### Mapping Table
 
 Since it's not possible to add tags directly to entities within Directus, `directus-sync` uses a mapping table that

packages/cli/src/lib/program.ts

@@ -65,6 +65,17 @@ function commaSeparatedList(value: string) {
   return value.split(',').map((v) => v.trim());
 }
 
+/**
+ * Split a comma separated list unless the value is "all" or "*"
+ */
+function commaSeparatedListOrAll(value: string) {
+  const v = value.trim();
+  if (v === '*' || v === 'all') {
+    return v;
+  }
+  return commaSeparatedList(value);
+}
+
 export function createProgram() {
   const program = createCommand();
   // Global options
@@ -113,6 +124,10 @@ export function createProgram() {
     '-o, --only-collections <onlyCollections>',
     `comma separated list of collections to include in the process (default to all)`,
   ).argParser(commaSeparatedList);
+  const preserveIdsOption = new Option(
+    '--preserve-ids <preserveIds>',
+    `comma separated list of collections that preserve their original ids (default to none). Use "*" or "all" to preserve all ids, if applicable.`,
+  ).argParser(commaSeparatedListOrAll);
 
   const snapshotPathOption = new Option(
     '--snapshot-path <snapshotPath>',
@@ -157,6 +172,7 @@ export function createProgram() {
     .addOption(collectionsPathOption)
     .addOption(excludeCollectionsOption)
     .addOption(onlyCollectionsOption)
+    .addOption(preserveIdsOption)
     .addOption(snapshotPathOption)
     .addOption(noSnapshotOption)
     .addOption(noSplitOption)
@@ -186,6 +202,7 @@ export function createProgram() {
     .addOption(collectionsPathOption)
     .addOption(excludeCollectionsOption)
     .addOption(onlyCollectionsOption)
+    .addOption(preserveIdsOption)
     .addOption(snapshotPathOption)
     .addOption(noSnapshotOption)
     .addOption(noSplitOption)
@@ -200,10 +217,10 @@ export function createProgram() {
     .command('untrack')
     .description('stop tracking of an element')
     .requiredOption(
-      '-c, --collection <collection>',
+      '--collection <collection>',
       'the collection of the element',
     )
-    .requiredOption('-i, --id <id>', 'the id of the element to untrack')
+    .requiredOption('--id <id>', 'the id of the element to untrack')
     .action(wrapAction(program, runUntrack));
 
   helpers
@@ -212,7 +229,7 @@ export function createProgram() {
       'remove conflicts in permissions when there are duplicated groups "role + collection + action".',
     )
     .option(
-      '-k, --keep <keep>',
+      '--keep <keep>',
       `the permission to keep in case of conflict: "first" or "last" (default "${DefaultConfig.keep}")`,
       'last',
     )

packages/cli/src/lib/services/collections/base/directus-collection.ts

@@ -1,6 +1,7 @@
 import { IdMap, IdMapperClient } from './id-mapper-client';
 import {
   DirectusBaseType,
+  DirectusCollectionExtraConfig,
   DirectusId,
   Query,
   UpdateItem,
@@ -28,6 +29,8 @@ export abstract class DirectusCollection<
   protected abstract readonly enableUpdate: boolean;
   protected abstract readonly enableDelete: boolean;
 
+  protected readonly hooks: CollectionHooks;
+
   /**
    * If true, the ids of the items will be used as sync ids.
    * This allows to restore the same ids as the original table.
@@ -47,8 +50,12 @@ export abstract class DirectusCollection<
     protected readonly dataMapper: DataMapper<DirectusType>,
     protected readonly idMapper: IdMapperClient,
     protected readonly migrationClient: MigrationClient,
-    protected readonly hooks: CollectionHooks,
-  ) {}
+    extraConfig: DirectusCollectionExtraConfig,
+  ) {
+    this.hooks = extraConfig.hooks;
+    // Override preserveIds if it is set to true in the extra config
+    this.preserveIds = extraConfig.preserveIds ? true : this.preserveIds;
+  }
 
   /**
    * Pull data from a table to a JSON file

packages/cli/src/lib/services/collections/base/interfaces.ts

@@ -1,5 +1,6 @@
 import { IdMapperClient } from './id-mapper-client';
 import { Query as DirectusQuery, RestCommand } from '@directus/sdk';
+import { CollectionHooks } from '../../config';
 
 export type DirectusId = number | string;
 
@@ -42,3 +43,8 @@ export type MultipleRestCommand<T> =
   | Command<T>
   | [...Command<object>[], Command<T>]
   | Promise<Command<T> | [...Command<object>[], Command<T>]>;
+
+export interface DirectusCollectionExtraConfig {
+  hooks: CollectionHooks;
+  preserveIds?: boolean;
+}

packages/cli/src/lib/services/collections/dashboards/collection.ts

@@ -37,7 +37,10 @@ export class DashboardsCollection extends DirectusCollection<DirectusDashboard>
       dataMapper,
       idMapper,
       migrationClient,
-      config.getCollectionHooksConfig(DASHBOARDS_COLLECTION),
+      {
+        hooks: config.getCollectionHooksConfig(DASHBOARDS_COLLECTION),
+        preserveIds: config.shouldPreserveIds(DASHBOARDS_COLLECTION),
+      },
     );
   }
 }

packages/cli/src/lib/services/collections/flows/collection.ts

@@ -39,7 +39,9 @@ export class FlowsCollection extends DirectusCollection<DirectusFlow> {
       dataMapper,
       idMapper,
       migrationClient,
-      config.getCollectionHooksConfig(FLOWS_COLLECTION),
+      {
+        hooks: config.getCollectionHooksConfig(FLOWS_COLLECTION),
+      },
     );
   }
 

packages/cli/src/lib/services/collections/folders/collection.ts

@@ -39,7 +39,9 @@ export class FoldersCollection extends DirectusCollection<DirectusFolder> {
       dataMapper,
       idMapper,
       migrationClient,
-      config.getCollectionHooksConfig(FOLDERS_COLLECTION),
+      {
+        hooks: config.getCollectionHooksConfig(FOLDERS_COLLECTION),
+      },
     );
   }
 }

packages/cli/src/lib/services/collections/operations/collection.ts

@@ -37,7 +37,10 @@ export class OperationsCollection extends DirectusCollection<DirectusOperation>
       dataMapper,
       idMapper,
       migrationClient,
-      config.getCollectionHooksConfig(OPERATIONS_COLLECTION),
+      {
+        hooks: config.getCollectionHooksConfig(OPERATIONS_COLLECTION),
+        preserveIds: config.shouldPreserveIds(OPERATIONS_COLLECTION),
+      },
     );
   }
 }

packages/cli/src/lib/services/collections/panels/collection.ts

@@ -37,7 +37,10 @@ export class PanelsCollection extends DirectusCollection<DirectusPanel> {
       dataMapper,
       idMapper,
       migrationClient,
-      config.getCollectionHooksConfig(PANELS_COLLECTION),
+      {
+        hooks: config.getCollectionHooksConfig(PANELS_COLLECTION),
+        preserveIds: config.shouldPreserveIds(PANELS_COLLECTION),
+      },
     );
   }
 }

packages/cli/src/lib/services/collections/permissions/collection.ts

@@ -37,7 +37,9 @@ export class PermissionsCollection extends DirectusCollection<DirectusPermission
       dataMapper,
       idMapper,
       migrationClient,
-      config.getCollectionHooksConfig(PERMISSIONS_COLLECTION),
+      {
+        hooks: config.getCollectionHooksConfig(PERMISSIONS_COLLECTION),
+      },
     );
   }
 }

packages/cli/src/lib/services/collections/presets/collection.ts

@@ -37,7 +37,9 @@ export class PresetsCollection extends DirectusCollection<DirectusPreset> {
       dataMapper,
       idMapper,
       migrationClient,
-      config.getCollectionHooksConfig(PRESETS_COLLECTION),
+      {
+        hooks: config.getCollectionHooksConfig(PRESETS_COLLECTION),
+      },
     );
   }
 }

packages/cli/src/lib/services/collections/roles/collection.ts

@@ -37,7 +37,10 @@ export class RolesCollection extends DirectusCollection<DirectusRole> {
       dataMapper,
       idMapper,
       migrationClient,
-      config.getCollectionHooksConfig(ROLES_COLLECTION),
+      {
+        hooks: config.getCollectionHooksConfig(ROLES_COLLECTION),
+        preserveIds: config.shouldPreserveIds(ROLES_COLLECTION),
+      },
     );
   }
 }

packages/cli/src/lib/services/collections/settings/collection.ts

@@ -37,7 +37,9 @@ export class SettingsCollection extends DirectusCollection<DirectusSettings> {
       dataMapper,
       idMapper,
       migrationClient,
-      config.getCollectionHooksConfig(SETTINGS_COLLECTION),
+      {
+        hooks: config.getCollectionHooksConfig(SETTINGS_COLLECTION),
+      },
     );
   }
 }

packages/cli/src/lib/services/collections/translations/collection.ts

@@ -37,7 +37,10 @@ export class TranslationsCollection extends DirectusCollection<DirectusTranslati
       dataMapper,
       idMapper,
       migrationClient,
-      config.getCollectionHooksConfig(TRANSLATIONS_COLLECTION),
+      {
+        hooks: config.getCollectionHooksConfig(TRANSLATIONS_COLLECTION),
+        preserveIds: config.shouldPreserveIds(TRANSLATIONS_COLLECTION),
+      },
     );
   }
 }