@appsemble/node-utils 0.28.9 → 0.28.10

package/README.md

@@ -1,9 +1,9 @@
-# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.28.9/config/assets/logo.svg) Appsemble Node Utilities
+# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.28.10/config/assets/logo.svg) Appsemble Node Utilities
 
 > NodeJS utilities used by Appsemble internally.
 
 [![npm](https://img.shields.io/npm/v/@appsemble/node-utils)](https://www.npmjs.com/package/@appsemble/node-utils)
-[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.28.9/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.28.9)
+[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.28.10/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.28.10)
 [![Prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://prettier.io)
 
 ## Table of Contents
@@ -26,5 +26,5 @@ compatibility is not guaranteed.
 
 ## License
 
-[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.28.9/LICENSE.md) ©
+[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.28.10/LICENSE.md) ©
 [Appsemble](https://appsemble.com)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/node-utils",
-  "version": "0.28.9",
+  "version": "0.28.10",
   "description": "NodeJS utilities used by Appsemble internally.",
   "keywords": [
     "app",
@@ -38,8 +38,8 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/types": "0.28.9",
-    "@appsemble/utils": "0.28.9",
+    "@appsemble/types": "0.28.10",
+    "@appsemble/utils": "0.28.10",
     "@formatjs/fast-memoize": "^2.0.0",
     "@fortawesome/fontawesome-free": "^6.0.0",
     "@koa/cors": "^4.0.0",

package/server/controllers/resources.js

@@ -355,36 +355,47 @@ export function createSeedResource(options) {
         ctx.body = Array.isArray(processedBody) ? createdResources : createdResources[0];
     };
 }
+async function deleteResourcesRecursively(type, app, options, context) {
+    const { deleteAppResource, getAppResources } = options;
+    const referencingResources = Object.entries(app.definition.resources).filter(([, resourceDefinition]) => {
+        var _a;
+        return Object.values((_a = resourceDefinition.references) !== null && _a !== void 0 ? _a : {}).find((resourceReference) => resourceReference.resource === type);
+    });
+    for (const [referencingResourceType] of referencingResources) {
+        await deleteResourcesRecursively(referencingResourceType, app, options, context);
+    }
+    const resourcesToDeleteFindOptions = {
+        where: {
+            type,
+            AppId: app.id,
+            or: [{ seed: true }, { ephemeral: true }],
+        },
+    };
+    const resourcesToDelete = await getAppResources({
+        app,
+        findOptions: resourcesToDeleteFindOptions,
+        type,
+        context,
+    });
+    for (const resourceToDelete of resourcesToDelete) {
+        await deleteAppResource({
+            app,
+            context,
+            options,
+            id: resourceToDelete.id,
+            type,
+        });
+    }
+}
 export function createDeleteSeedResources(options) {
     return async (ctx) => {
         var _a;
         const { pathParams: { appId }, } = ctx;
-        const { deleteAppResource, getApp, getAppResources } = options;
+        const { getApp } = options;
         const app = await getApp({ context: ctx, query: { where: { id: appId } } });
         assertKoaError(!app, ctx, 404, 'App not found');
         for (const resourceType of Object.keys((_a = app.definition.resources) !== null && _a !== void 0 ? _a : {})) {
-            const resourcesToDeleteFindOptions = {
-                where: {
-                    type: resourceType,
-                    AppId: appId,
-                    or: [{ seed: true }, { ephemeral: true }],
-                },
-            };
-            const resourcesToDelete = await getAppResources({
-                app,
-                findOptions: resourcesToDeleteFindOptions,
-                type: resourceType,
-                context: ctx,
-            });
-            for (const resourceToDelete of resourcesToDelete) {
-                await deleteAppResource({
-                    app,
-                    context: ctx,
-                    options,
-                    id: resourceToDelete.id,
-                    type: resourceType,
-                });
-            }
+            await deleteResourcesRecursively(resourceType, app, options, ctx);
         }
     };
 }