Fix snapshot issue

Author: u12206050

CHANGELOG.md

@@ -1,4 +1,8 @@
-# Version 3.1.0
+# Version 3.1.1
+
+  - **Fixed** Snapshot undefined issue
+
+## Version 3.1.0
 
   - **Updated** Packages and build.
   - **Added** More logging for schema import

package-lock.json

@@ -2,7 +2,7 @@
 	"name": "directus-extension-schema-sync",
 	"description": "Sync schema and data betwreen Directus instances",
 	"icon": "sync_alt",
-	"version": "3.1.0",
+	"version": "3.1.1",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/bcc-code/directus-schema-sync.git"
@@ -36,6 +36,8 @@
 		"release-channel": "node ./scripts/release-channel.js"
 	},
 	"devDependencies": {
+		"@directus/extensions": "^3.0.15",
+		"@directus/types": "^13.5.0",
 		"@types/keyv": "^4.2.0",
 		"@types/node": "^20.14.15",
 		"rollup-plugin-exclude-dependencies-from-bundle": "^1.1.24",
@@ -45,8 +47,6 @@
 		"glob": "^10.4.5"
 	},
 	"peerDependencies": {
-		"@directus/api": "^32.1.1",
-		"@directus/extensions": "^3.0.14",
-		"@directus/types": "^13.4.0"
+		"@directus/api": "^32.0.0"
 	}
 }

package.json

@@ -1,5 +1,5 @@
 import type { ApiExtensionContext } from '@directus/extensions';
-import { Item, PrimaryKey, Query } from '@directus/types';
+import type { Item, PrimaryKey, Query } from '@directus/types';
 import { mkdir, readFile, rm, writeFile } from 'fs/promises';
 import { glob } from 'glob';
 import { condenseAction } from './condenseAction.js';

src/collectionExporter.ts

@@ -1,5 +1,5 @@
-import { ActionHandler } from '@directus/types';
 import type { ApiExtensionContext } from '@directus/extensions';
+import type { ActionHandler } from '@directus/types';
 import { CollectionExporter } from './collectionExporter.js';
 import { ExportCollectionConfig, IExporterConfig, IGetItemsService } from './types';
 

src/exportManager.ts

@@ -1,4 +1,4 @@
-import { getFlowManager } from '@directus/api/flows';
+import { useBus } from '@directus/api/bus/index';
 import type { HookConfig } from '@directus/extensions';
 import type { SchemaOverview } from '@directus/types';
 import { condenseAction } from './condenseAction';
@@ -99,8 +99,10 @@ const registerHook: HookConfig = async ({ action, init }, { env, services, datab
 	}
 
 	async function reloadDirectusModules() {
-		const flowManager = getFlowManager();
-		await flowManager.reload();
+		const messenger = useBus();
+		if (!messenger) return;
+
+		messenger.publish('flows', { type: 'reload' });
 	}
 
 	// LOAD EXPORTED SCHEMAS & COLLECTIONS

src/index.ts

@@ -1,6 +1,6 @@
 import type { Snapshot, SnapshotField, SnapshotRelation } from '@directus/api/dist/types';
 import type { ApiExtensionContext } from '@directus/extensions';
-import { Collection } from '@directus/types';
+import type { Collection, ExtensionsServices } from '@directus/types';
 import { mkdir, readFile, rm, writeFile } from 'fs/promises';
 import { glob } from 'glob';
 import { condenseAction } from './condenseAction.js';
@@ -10,16 +10,14 @@ import { ExportHelper } from './utils.js';
 
 export class SchemaExporter implements IExporter {
 	protected _filePath: string;
-	protected _getSchemaService: () => Promise<any>;
 	protected _exportHandler = condenseAction(() => this.createAndSaveSnapshot());
 
 	// Directus SchemaService, database and getSchema
 	constructor(
-		getSchemaService: () => Promise<any>,
+		protected getSchemaService: () => Promise<InstanceType<ExtensionsServices['SchemaService']>>,
 		protected logger: ApiExtensionContext['logger'],
 		protected options = { split: true }
 	) {
-		this._getSchemaService = () => getSchemaService();
 		this._filePath = `${ExportHelper.dataDir}/schema.json`;
 	}
 
@@ -47,7 +45,7 @@ export class SchemaExporter implements IExporter {
 	 * Import the schema from file to the database
 	 */
 	public load = async () => {
-		const svc = await this._getSchemaService();
+		const svc = await this.getSchemaService();
 		let json;
 		try {
 			json = await readFile(this._filePath, { encoding: 'utf8' });
@@ -128,7 +126,7 @@ export class SchemaExporter implements IExporter {
 	 * Create and save the schema snapshot to file
 	 */
 	protected createAndSaveSnapshot = async () => {
-		const svc = this._getSchemaService();
+		const svc = await this.getSchemaService();
 		let snapshot = (await svc.snapshot()) as Snapshot;
 		snapshot = exportHook(snapshot);
 		let hash = svc.getHashedSnapshot(snapshot).hash;

src/schemaExporter.ts

@@ -1,5 +1,4 @@
 import type { Knex } from 'knex';
-import { ExportHelper } from './utils';
 
 export class UpdateManager {
 	protected db: Knex;

src/updateManager.ts

@@ -1,4 +1,4 @@
-import { Accountability } from '@directus/types';
+import type { Accountability } from '@directus/types';
 import { createHash } from 'crypto';
 import { access, readFile, readdir, writeFile } from 'fs/promises';
 import { resolve } from 'path';