@appsemble/node-utils 0.28.8 → 0.28.10

package/README.md

@@ -1,9 +1,9 @@
-# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.28.8/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.8/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.28.8)
+[![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.8/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.8",
+  "version": "0.28.10",
   "description": "NodeJS utilities used by Appsemble internally.",
   "keywords": [
     "app",
@@ -38,8 +38,8 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/types": "0.28.8",
-    "@appsemble/utils": "0.28.8",
+    "@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/appVariables.d.ts

@@ -0,0 +1,3 @@
+import { type Middleware } from 'koa';
+import { type Options } from '../types.js';
+export declare function createGetAppVariables({ getApp, getAppVariables }: Options): Middleware;

package/server/controllers/appVariables.js

@@ -0,0 +1,15 @@
+import { assertKoaError } from '../../koa.js';
+export function createGetAppVariables({ getApp, getAppVariables }) {
+    return async (ctx) => {
+        const { pathParams: { appId }, } = ctx;
+        const app = await getApp({ context: ctx, query: { where: { id: appId } } });
+        assertKoaError(!app, ctx, 404, 'App not found');
+        const variables = await getAppVariables({
+            context: ctx,
+            app,
+            query: { attributes: ['id', 'name', 'value'] },
+        });
+        ctx.body = variables;
+    };
+}
+//# sourceMappingURL=appVariables.js.map

package/server/controllers/index.d.ts

@@ -3,5 +3,6 @@ export * from './appMessages.js';
 export * from './assets.js';
 export * from './resources.js';
 export * from './appMembers.js';
+export * from './appVariables.js';
 export * from './teams.js';
 export * from './oauth2Provider.js';

package/server/controllers/index.js

@@ -3,6 +3,7 @@ export * from './appMessages.js';
 export * from './assets.js';
 export * from './resources.js';
 export * from './appMembers.js';
+export * from './appVariables.js';
 export * from './teams.js';
 export * from './oauth2Provider.js';
 //# sourceMappingURL=index.js.map

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);
         }
     };
 }

package/server/types.d.ts

@@ -58,7 +58,6 @@ declare module 'koas-security' {
 declare module 'koas-parameters' {
     interface PathParams {
         appId: number;
-        appPath: string;
         appCollectionId: number;
         appOAuth2SecretId: number;
         appSamlSecretId: number;
@@ -133,6 +132,9 @@ export interface GetAppSubEntityParams {
     context: ParameterizedContext<DefaultState, DefaultContextInterface, any>;
     app: App;
 }
+export interface GetAppVariablesParams extends GetAppSubEntityParams {
+    query?: Record<string, any>;
+}
 export interface GetAppMessagesParams extends GetAppSubEntityParams {
     language?: string;
     merge?: string[] | string;
@@ -386,6 +388,6 @@ export interface Options {
     deleteAppAsset: (params: DeleteAppAssetParams) => Promise<number>;
     email: (params: EmailParams) => Promise<void>;
     sendNotifications: (params: SendNotificationsParams) => Promise<void>;
-    getAppVariables: (params: GetAppSubEntityParams) => Promise<AppConfigEntry[]>;
+    getAppVariables: (params: GetAppVariablesParams) => Promise<AppConfigEntry[]>;
 }
 export {};