@appsemble/node-utils 0.34.15 → 0.34.18-test.1

package/README.md

@@ -1,9 +1,9 @@
-# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.34.15/config/assets/logo.svg) Appsemble Node Utilities
+# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.34.18-test.1/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.34.15/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.34.15)
+[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.34.18-test.1/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.34.18-test.1)
 [![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.34.15/LICENSE.md) ©
+[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.34.18-test.1/LICENSE.md) ©
 [Appsemble](https://appsemble.com)

package/app.js

@@ -242,6 +242,7 @@ export async function applyAppVariant(appPath, appVariant) {
         await transferAppVariantFiles(appPath, appVariantDefDir, appVariantDestDir, 'config');
         await transferAppVariantFiles(appPath, appVariantDefDir, appVariantDestDir, 'assets');
         await transferAppVariantFiles(appPath, appVariantDefDir, appVariantDestDir, 'resources');
+        await transferAppVariantFiles(appPath, appVariantDefDir, appVariantDestDir, 'members');
         await transferAppVariantFiles(appPath, appVariantDefDir, appVariantDestDir, 'screenshots');
         await transferAppVariantFiles(appPath, appVariantDefDir, appVariantDestDir, 'icon.png');
         await transferAppVariantFiles(appPath, appVariantDefDir, appVariantDestDir, 'maskable-icon.png');

package/getMessagesUtil.js

@@ -12,7 +12,10 @@ export async function getMessagesUtil(ctx, language, appId, merge, { getApp, get
         .subtags()
         .find((sub) => sub.type() === 'language');
     const baseLang = baseLanguage && String(baseLanguage).toLowerCase();
-    const app = await getApp({ context: ctx, query: { where: { id: appId } } });
+    const app = await getApp({
+        context: ctx,
+        query: { attributes: ['id', 'definition'], where: { id: appId } },
+    });
     assertKoaCondition(app != null, ctx, 404, 'App not found');
     const blockPrefixes = [];
     const blockQuery = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/node-utils",
-  "version": "0.34.15",
+  "version": "0.34.18-test.1",
   "description": "NodeJS utilities used by Appsemble internally.",
   "keywords": [
     "app",
@@ -40,9 +40,9 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/types": "0.34.15",
-    "@appsemble/utils": "0.34.15",
-    "@appsemble/lang-sdk": "0.34.15",
+    "@appsemble/types": "0.34.18-test.1",
+    "@appsemble/utils": "0.34.18-test.1",
+    "@appsemble/lang-sdk": "0.34.18-test.1",
     "@formatjs/fast-memoize": "^2.0.0",
     "@fortawesome/fontawesome-free": "^6.0.0",
     "@kubernetes/client-node": "^0.22.2",

package/resource.d.ts

@@ -62,5 +62,5 @@ export declare function extractResourceBody(ctx: Context | ParameterizedContext<
  */
 export declare function processResourceBody(ctx: Context | ParameterizedContext<DefaultState, DefaultContext, any>, definition: ResourceDefinition, knownAssetIds?: string[], knownExpires?: Date, knownAssetNameIds?: {
     id: string;
-    name: string;
+    name?: string;
 }[], isPatch?: boolean): [Record<string, unknown> | Record<string, unknown>[], PreparedAsset[], string[]];

package/server/controllers/common/apps/assets/createGetAppAssetByIdController.js

@@ -3,7 +3,7 @@ import { assertKoaCondition } from '../../../../../koa.js';
 export function createGetAppAssetByIdController({ getApp, getAppAsset }) {
     return async (ctx) => {
         const { pathParams: { appId, assetId }, } = ctx;
-        const app = await getApp({ context: ctx, query: { where: { id: appId } } });
+        const app = await getApp({ context: ctx, query: { attributes: ['id'], where: { id: appId } } });
         assertKoaCondition(app != null, ctx, 404, 'App not found');
         const asset = await getAppAsset({ app, context: ctx, id: assetId });
         if (assetId !== asset.id) {

package/server/controllers/common/apps/groups/createGetAppGroupsController.js

@@ -3,7 +3,7 @@ import { assertKoaCondition } from '../../../../../koa.js';
 export function createGetAppGroupsController({ checkAuthSubjectAppPermissions, getApp, getAppGroups, }) {
     return async (ctx) => {
         const { pathParams: { appId }, } = ctx;
-        const app = await getApp({ context: ctx, query: { where: { id: appId } } });
+        const app = await getApp({ context: ctx, query: { attributes: ['id'], where: { id: appId } } });
         assertKoaCondition(app != null, ctx, 404, 'App not found');
         await checkAuthSubjectAppPermissions({
             app,

package/server/controllers/common/apps/resources/createCountAppResourcesController.js

@@ -3,7 +3,10 @@ export function createCountAppResourcesController(options) {
     return async (ctx) => {
         const { pathParams: { appId, resourceType }, queryParams: { $own, selectedGroupId }, user: authSubject, } = ctx;
         const { checkAppPermissions, getApp, getAppResources } = options;
-        const app = await getApp({ context: ctx, query: { where: { id: appId } } });
+        const app = await getApp({
+            context: ctx,
+            query: { where: { id: appId }, attributes: ['demoMode', 'id'] },
+        });
         await checkAppPermissions({
             context: ctx,
             permissions: [

package/server/controllers/common/apps/resources/createCreateAppResourceController.js

@@ -17,7 +17,10 @@ export function createCreateAppResourceController(options) {
     return async (ctx) => {
         const { pathParams: { appId, resourceType }, query, queryParams: { selectedGroupId }, } = ctx;
         const { checkAppPermissions, createAppResourcesWithAssets, getApp, getAppAssets } = options;
-        const app = await getApp({ context: ctx, query: { where: { id: appId } } });
+        const app = await getApp({
+            context: ctx,
+            query: { attributes: ['id', 'demoMode', 'definition'], where: { id: appId } },
+        });
         await checkAppPermissions({
             context: ctx,
             permissions: [`$resource:${resourceType}:create`],
@@ -26,10 +29,7 @@ export function createCreateAppResourceController(options) {
         });
         const resourceDefinition = getResourceDefinition(app.definition, resourceType, ctx);
         const appAssets = await getAppAssets({ app, context: ctx });
-        const [processedBody, preparedAssets] = processResourceBody(ctx, resourceDefinition, undefined, undefined, 
-        // @ts-expect-error 2345 argument of type is not assignable to parameter of type
-        // (strictNullChecks)
-        appAssets.map((appAsset) => ({ id: appAsset.id, name: appAsset.name })));
+        const [processedBody, preparedAssets] = processResourceBody(ctx, resourceDefinition, appAssets.map(({ id }) => id), undefined, appAssets.map((appAsset) => ({ id: appAsset.id, name: appAsset.name })));
         if (Array.isArray(processedBody) && !processedBody.length) {
             ctx.body = [];
             return;

package/server/controllers/common/apps/resources/createDeleteAppResourceController.js

@@ -3,7 +3,10 @@ export function createDeleteAppResourceController(options) {
     return async (ctx) => {
         const { pathParams: { appId, resourceId, resourceType }, queryParams: { selectedGroupId }, user: authSubject, } = ctx;
         const { checkAppPermissions, deleteAppResource, getApp, getAppResource } = options;
-        const app = await getApp({ context: ctx, query: { where: { id: appId } } });
+        const app = await getApp({
+            context: ctx,
+            query: { attributes: ['demoMode', 'id'], where: { id: appId } },
+        });
         const findOptions = {
             where: {
                 id: resourceId,

package/server/controllers/common/apps/resources/createGetAppResourceByIdController.js

@@ -4,7 +4,10 @@ export function createGetAppResourceByIdController(options) {
     return async (ctx) => {
         const { pathParams: { appId, resourceId, resourceType }, queryParams: { selectedGroupId, view }, user: authSubject, } = ctx;
         const { checkAppPermissions, getApp, getAppResource } = options;
-        const app = await getApp({ context: ctx, query: { where: { id: appId } } });
+        const app = await getApp({
+            context: ctx,
+            query: { attributes: ['demoMode', 'definition', 'id'], where: { id: appId } },
+        });
         const findOptions = {
             where: {
                 id: resourceId,

package/server/controllers/common/apps/resources/createQueryAppResourcesController.js

@@ -5,7 +5,10 @@ export function createQueryAppResourcesController(options) {
     return async (ctx) => {
         const { pathParams: { appId, resourceType }, queryParams: { $own, $select, $skip, $top, selectedGroupId, view }, user: authSubject, } = ctx;
         const { checkAppPermissions, getApp, getAppResources } = options;
-        const app = await getApp({ context: ctx, query: { where: { id: appId } } });
+        const app = await getApp({
+            context: ctx,
+            query: { attributes: ['definition', 'demoMode', 'id'], where: { id: appId } },
+        });
         const resourceDefinition = getResourceDefinition(app.definition, resourceType, ctx, view);
         const { order, where } = generateResourceQuery(ctx, options, resourceDefinition);
         await checkAppPermissions({

package/server/controllers/common/apps/resources/createUpdateAppResourceController.js

@@ -3,7 +3,10 @@ export function createUpdateAppResourceController(options) {
     return async (ctx) => {
         const { pathParams: { appId, resourceId, resourceType }, queryParams: { selectedGroupId }, user: authSubject, } = ctx;
         const { checkAppPermissions, getApp, getAppAssets, getAppResource, updateAppResource } = options;
-        const app = await getApp({ context: ctx, query: { where: { id: appId } } });
+        const app = await getApp({
+            context: ctx,
+            query: { attributes: ['id', 'demoMode', 'definition'], where: { id: appId } },
+        });
         const findOptions = {
             where: {
                 id: resourceId,
@@ -34,10 +37,7 @@ export function createUpdateAppResourceController(options) {
         });
         const appAssets = await getAppAssets({ context: ctx, app });
         const resourceDefinition = getResourceDefinition(app.definition, resourceType, ctx);
-        const [processedBody, preparedAssets, deletedAssetIds] = processResourceBody(ctx, resourceDefinition, appAssets.filter((asset) => asset.resourceId === resourceId).map((asset) => asset.id), oldResource.expires, 
-        // @ts-expect-error 2345 argument of type is not assignable to parameter of type
-        // (strictNullChecks)
-        appAssets.map((asset) => ({ id: asset.id, name: asset.name })));
+        const [processedBody, preparedAssets, deletedAssetIds] = processResourceBody(ctx, resourceDefinition, appAssets.filter((asset) => asset.resourceId === resourceId).map((asset) => asset.id), oldResource.expires, appAssets.map((asset) => ({ id: asset.id, name: asset.name })));
         const resources = Array.isArray(processedBody) ? processedBody : [processedBody];
         ctx.body = await updateAppResource({
             app,

package/server/controllers/common/apps/variables/createGetAppVariablesController.js

@@ -2,7 +2,7 @@ import { assertKoaCondition } from '../../../../../koa.js';
 export function createGetAppVariablesController({ getApp, getAppVariables }) {
     return async (ctx) => {
         const { pathParams: { appId }, } = ctx;
-        const app = await getApp({ context: ctx, query: { where: { id: appId } } });
+        const app = await getApp({ context: ctx, query: { attributes: ['id'], where: { id: appId } } });
         assertKoaCondition(app != null, ctx, 404, 'App not found');
         ctx.body = await getAppVariables({
             context: ctx,

package/server/controllers/main/apps/assets/createCreateAppAssetController.js

@@ -2,7 +2,7 @@ import { assertKoaCondition } from '../../../../../koa.js';
 export function createCreateAppAssetController({ createAppAsset, getApp }) {
     return async (ctx) => {
         const { pathParams: { appId }, request: { body: { file: { filename, mime, path }, name, }, }, } = ctx;
-        const app = await getApp({ context: ctx, query: { where: { id: appId } } });
+        const app = await getApp({ context: ctx, query: { attributes: ['id'], where: { id: appId } } });
         assertKoaCondition(app != null, ctx, 404, 'App not found');
         const asset = await createAppAsset({
             app,

package/server/controllers/main/apps/resources/createDeleteAppSeedResourcesController.js

@@ -4,7 +4,10 @@ export function createDeleteAppSeedResourcesController(options) {
     return async (ctx) => {
         const { pathParams: { appId }, } = ctx;
         const { getApp } = options;
-        const app = await getApp({ context: ctx, query: { where: { id: appId } } });
+        const app = await getApp({
+            context: ctx,
+            query: { attributes: ['id', 'definition'], where: { id: appId } },
+        });
         assertKoaCondition(app != null, ctx, 404, 'App not found');
         for (const resourceType of Object.keys(app.definition.resources ?? {})) {
             await deleteResourcesRecursively(resourceType, app, options, ctx);

package/server/routes/appRouter/blockCssHandler.js

@@ -4,7 +4,7 @@ export function createBlockCssHandler({ getApp, getAppBlockStyles }) {
         const { 
         // @ts-expect-error Messed up
         params: { name }, } = ctx;
-        const app = await getApp({ context: ctx });
+        const app = await getApp({ query: { attributes: ['id'] }, context: ctx });
         assertKoaCondition(app != null, ctx, 404, 'App not found');
         const appBlockStyles = await getAppBlockStyles({ app, name, context: ctx });
         const [style] = appBlockStyles;

package/server/routes/appRouter/iconHandler.js

@@ -7,7 +7,10 @@ export function createIconHandler({ getApp, getAppIcon, getDbUpdated }) {
         params: { size = 128 }, query: { maskable = false, updated }, } = ctx;
         const app = await getApp({
             context: ctx,
-            query: { where: { ...(updated ? { updated } : {}) } },
+            query: {
+                attributes: ['id', 'icon', 'created', 'updated'],
+                where: { ...(updated ? { updated } : {}) },
+            },
         });
         const dbUpdated = app ? await getDbUpdated({ app, maskable, context: ctx }) : false;
         const appIcon = app ? await getAppIcon({ app, context: ctx }) : null;

package/server/routes/appRouter/indexHandler.js

@@ -10,6 +10,7 @@ export function createIndexHandler({ createSettings, getApp, getAppDetails, getA
     return async (ctx) => {
         const { hostname, path } = ctx;
         const host = getHost({ context: ctx });
+        // Most of the fields here are used either directly or indirectly that's why no attributes query
         const app = await getApp({ context: ctx });
         if (!app) {
             const { appPath, organizationId } = await getAppDetails({ context: ctx });

package/server/routes/appRouter/manifestHandler.js

@@ -5,7 +5,7 @@ import { extension } from 'mime-types';
 const iconSizes = [48, 144, 192, 512];
 export function createManifestHandler({ getApp, getAppScreenshots }) {
     return async (ctx) => {
-        const app = await getApp({ context: ctx });
+        const app = await getApp({ context: ctx, query: { attributes: ['id', 'definition'] } });
         assertKoaCondition(app != null, ctx, 404, 'Block asset not found');
         const { defaultPage, description, name, theme = baseTheme } = app.definition;
         const { themeColor = '#ffffff', splashColor = themeColor } = theme;

package/server/routes/appRouter/readmeHandler.js

@@ -3,7 +3,7 @@ export function createReadmeHandler({ getApp, getAppReadmes }) {
     return async (ctx) => {
         // @ts-expect-error Messed up
         const { id } = ctx.params;
-        const app = await getApp({ context: ctx });
+        const app = await getApp({ context: ctx, query: { attributes: ['id'] } });
         assertKoaCondition(app != null, ctx, 404, 'App not found');
         const appReadmes = await getAppReadmes({ app, context: ctx });
         const appReadme = appReadmes.find((readme) => readme.id === Number.parseInt(id));

package/server/routes/appRouter/robotsHandler.js

@@ -1,7 +1,7 @@
 import { assertKoaCondition, logger } from '@appsemble/node-utils';
 export function createRobotsHandler({ getApp }) {
     return async (ctx) => {
-        const app = await getApp({ context: ctx });
+        const app = await getApp({ context: ctx, query: { attributes: ['id', 'visibility'] } });
         assertKoaCondition(app != null, ctx, 404, 'App not found');
         switch (app.visibility) {
             case 'public':

package/server/routes/appRouter/screenshotHandler.js

@@ -3,7 +3,7 @@ export function createScreenshotHandler({ getApp, getAppScreenshots }) {
     return async (ctx) => {
         // @ts-expect-error Messed up
         const { id } = ctx.params;
-        const app = await getApp({ context: ctx });
+        const app = await getApp({ context: ctx, query: { attributes: ['id'] } });
         assertKoaCondition(app != null, ctx, 404, 'App not found');
         const appScreenshots = await getAppScreenshots({ app, context: ctx });
         const appScreenshot = appScreenshots.find((screenshot) => screenshot.id === Number.parseInt(id));

package/server/routes/appRouter/serviceWorkerHandler.js

@@ -8,10 +8,14 @@ export function createServiceWorkerHandler({ getApp, getBlocksAssetsPaths }) {
         const serviceWorker = await (production
             ? readFile(new URL('../../../../../dist/app/service-worker.js', import.meta.url), 'utf8')
             : ctx.fs.promises.readFile(filename, 'utf8'));
-        const app = await getApp({ context: ctx });
+        const app = await getApp({
+            context: ctx,
+            query: { attributes: ['id', 'definition'] },
+        });
         assertKoaCondition(app != null, ctx, 404, 'App does not exist.');
         const identifiableBlocks = getAppBlocks(app.definition);
         const blocksAssetsPaths = await getBlocksAssetsPaths({ identifiableBlocks, context: ctx });
+        // App.version is a virtual column and comes from App.AppSnapshots
         ctx.body = `const appVersion = ${app.version};const blockAssets=${JSON.stringify(blocksAssetsPaths)};${serviceWorker}`;
         ctx.type = 'application/javascript';
     };

package/server/utils/actions.js

@@ -169,7 +169,10 @@ async function handleRequestProxy(ctx, app, action, useBody, options) {
 export function createProxyHandler(useBody, options) {
     return async (ctx) => {
         const { pathParams: { appId, path }, } = ctx;
-        const app = await options.getApp({ context: ctx, query: { where: { id: appId } } });
+        const app = await options.getApp({
+            context: ctx,
+            query: { attributes: ['id', 'definition'], where: { id: appId } },
+        });
         assertKoaCondition(app != null, ctx, 404, 'App not found');
         const appAction = get(app.definition, path);
         const action = supportedActions.find((act) => act === appAction?.type);