@appsemble/cli 0.24.10 → 0.24.13

package/README.md

@@ -1,9 +1,9 @@
-# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.24.10/config/assets/logo.svg) Appsemble CLI
+# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.24.13/config/assets/logo.svg) Appsemble CLI
 
 > Manage apps and blocks from the command line.
 
 [![npm](https://img.shields.io/npm/v/@appsemble/cli)](https://www.npmjs.com/package/@appsemble/cli)
-[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.24.10/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.24.10)
+[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.24.13/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.24.13)
 [![Prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://prettier.io)
 
 ## Table of Contents
@@ -304,5 +304,5 @@ appsemble run-cronjobs --interval 30
 
 ## License
 
-[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.24.10/LICENSE.md) ©
+[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.24.13/LICENSE.md) ©
 [Appsemble](https://appsemble.com)

package/commands/resource/publish.js

@@ -41,7 +41,7 @@ export async function handler({ app, appId, clientCredentials, context, paths, r
     for (const path of files) {
         logger.info('');
         await publishResource({
-            resourceName,
+            type: resourceName,
             appId: resolvedAppId,
             path,
             remote: resolvedRemote,

package/lib/app.js

@@ -8,6 +8,7 @@ import axios from 'axios';
 import fg from 'fast-glob';
 import FormData from 'form-data';
 import normalizePath from 'normalize-path';
+import { parse as parseYaml } from 'yaml';
 import { publishAsset } from './asset.js';
 import { traverseBlockThemes } from './block.js';
 import { coerceRemote } from './coercers.js';
@@ -15,7 +16,7 @@ import { getProjectBuildConfig } from './config.js';
 import { printAxiosError } from './output.js';
 import { processCss } from './processCss.js';
 import { buildProject, makeProjectPayload } from './project.js';
-import { publishResource } from './resource.js';
+import { publishResourcesRecursively } from './resource.js';
 /**
  * Traverses an app directory and appends the files it finds to the given FormData object.
  *
@@ -352,6 +353,7 @@ export async function updateApp({ clientCredentials, context, force, path, ...op
     const sentryDsn = (_l = appsembleContext.sentryDsn) !== null && _l !== void 0 ? _l : options.sentryDsn;
     const sentryEnvironment = (_m = appsembleContext.sentryEnvironment) !== null && _m !== void 0 ? _m : options.sentryEnvironment;
     const googleAnalyticsId = (_o = appsembleContext.googleAnalyticsId) !== null && _o !== void 0 ? _o : options.googleAnalyticsId;
+    const { appLock } = appsembleContext;
     logger.info(`App id: ${id}`);
     logger.verbose(`App remote: ${remote}`);
     logger.verbose(`App is template: ${inspect(template, { colors: true })}`);
@@ -388,6 +390,18 @@ export async function updateApp({ clientCredentials, context, force, path, ...op
         formData.append('googleAnalyticsID', googleAnalyticsId);
     }
     await authenticate(remote, 'apps:write', clientCredentials);
+    if (appLock) {
+        logger.info(`Setting AppLock to ${appLock}`);
+        try {
+            await axios.post(`/api/apps/${id}/lock`, {
+                locked: appLock,
+            });
+        }
+        catch (error) {
+            logger.error(error);
+            process.exit(1);
+        }
+    }
     let data;
     try {
         data = await axios
@@ -448,6 +462,7 @@ export async function publishApp({ assets, assetsClonable, clientCredentials, co
     const sentryDsn = (_l = appsembleContext.sentryDsn) !== null && _l !== void 0 ? _l : options.sentryDsn;
     const sentryEnvironment = (_m = appsembleContext.sentryEnvironment) !== null && _m !== void 0 ? _m : options.sentryEnvironment;
     const googleAnalyticsId = (_o = appsembleContext.googleAnalyticsId) !== null && _o !== void 0 ? _o : options.googleAnalyticsId;
+    const appLock = appsembleContext.appLock || 'unlocked';
     logger.verbose(`App remote: ${remote}`);
     logger.verbose(`App organization: ${organizationId}`);
     logger.verbose(`App is template: ${inspect(template, { colors: true })}`);
@@ -461,6 +476,7 @@ export async function publishApp({ assets, assetsClonable, clientCredentials, co
     formData.append('demoMode', String(demoMode));
     formData.append('visibility', visibility);
     formData.append('iconBackground', iconBackground);
+    formData.append('locked', appLock);
     if (icon) {
         const realIcon = typeof icon === 'string' ? createReadStream(icon) : icon;
         logger.info(`Using icon from ${(_p = realIcon.path) !== null && _p !== void 0 ? _p : 'stdin'}`);
@@ -535,17 +551,20 @@ export async function publishApp({ assets, assetsClonable, clientCredentials, co
             }
         }
         if (resources && existsSync(join(path, 'resources'))) {
+            const appDefinition = parseYaml(yaml, { maxAliasCount: 10000 });
             const resourcePath = join(path, 'resources');
             try {
                 const resourceFiles = await readdir(resourcePath, { withFileTypes: true });
+                const resourcesToPublish = [];
+                const publishedResourcesIds = {};
                 for (const resource of resourceFiles) {
                     if (resource.isFile()) {
                         const { name } = parse(resource.name);
-                        await publishResource({
+                        resourcesToPublish.push({
                             appId: data.id,
                             path: join(resourcePath, resource.name),
-                            remote,
-                            resourceName: name,
+                            definition: appDefinition.resources[name],
+                            type: name,
                         });
                     }
                     else if (resource.isDirectory()) {
@@ -553,15 +572,20 @@ export async function publishApp({ assets, assetsClonable, clientCredentials, co
                             withFileTypes: true,
                         });
                         for (const subResource of subDirectoryResources.filter((s) => s.isFile())) {
-                            await publishResource({
+                            resourcesToPublish.push({
                                 appId: data.id,
                                 path: join(resourcePath, resource.name, subResource.name),
-                                remote,
-                                resourceName: resource.name,
+                                definition: appDefinition.resources[resource.name],
+                                type: resource.name,
                             });
                         }
                     }
                 }
+                await publishResourcesRecursively({
+                    remote,
+                    resourcesToPublish,
+                    publishedResourcesIds,
+                });
             }
             catch (error) {
                 logger.error('Something went wrong when creating resources:');

package/lib/resource.d.ts

@@ -1,3 +1,4 @@
+import { type ResourceDefinition } from '@appsemble/types';
 interface UpdateResourceParams {
     /**
      * The name of the resource that a new entry is being created of.
@@ -20,7 +21,7 @@ interface PublishResourceParams {
     /**
      * The name of the resource that a new entry is being created of.
      */
-    resourceName: string;
+    type: string;
     /**
      * The path in which the resource JSON is located.
      */
@@ -33,7 +34,36 @@ interface PublishResourceParams {
      * The remote server to publish the resource on.
      */
     remote: string;
+    /**
+     * The definition of the resource.
+     */
+    definition?: ResourceDefinition;
+    /**
+     * An array of property name to value maps of referenced resources.
+     */
+    publishedResourcesIds?: Record<string, number[]>;
+}
+export interface ResourceToPublish {
+    appId: number;
+    path: string;
+    type: string;
+    definition: ResourceDefinition;
+}
+interface PublishResourcesRecursivelyParams {
+    /**
+     * The remote server to publish the resource on.
+     */
+    remote: string;
+    /**
+     * All resources that need to be published.
+     */
+    resourcesToPublish: ResourceToPublish[];
+    /**
+     * Already published resources.
+     */
+    publishedResourcesIds: Record<string, number[]>;
 }
-export declare function publishResource({ appId, path, remote, resourceName, }: PublishResourceParams): Promise<void>;
+export declare function publishResource({ appId, definition, path, publishedResourcesIds, remote, type, }: PublishResourceParams): Promise<number[]>;
+export declare function publishResourcesRecursively({ publishedResourcesIds, remote, resourcesToPublish, }: PublishResourcesRecursivelyParams): Promise<Record<string, number[]>>;
 export declare function updateResource({ appId, path, remote, resourceName, }: UpdateResourceParams): Promise<void>;
 export {};

package/lib/resource.js

@@ -1,7 +1,7 @@
 import { readFile } from 'node:fs/promises';
 import { AppsembleError, logger, readData } from '@appsemble/node-utils';
 import axios from 'axios';
-export async function publishResource({ appId, path, remote, resourceName, }) {
+export async function publishResource({ appId, definition, path, publishedResourcesIds = {}, remote, type, }) {
     const csv = path.endsWith('.csv');
     let resources;
     if (csv) {
@@ -15,15 +15,67 @@ export async function publishResource({ appId, path, remote, resourceName, }) {
         resources = [].concat(file);
     }
     logger.info(`Publishing resource(s) from ${path}`);
-    const { data } = await axios.post(`/api/apps/${appId}/resources/${resourceName}`, resources, {
-        baseURL: remote,
-        headers: { 'content-type': csv ? 'text/csv' : 'application/json' },
-    });
+    let data;
+    if (csv) {
+        const response = await axios.post(`/api/apps/${appId}/resources/${type}`, resources, {
+            baseURL: remote,
+            headers: { 'content-type': 'text/csv' },
+        });
+        data = response.data;
+    }
+    else {
+        const response = await axios.post(`/api/apps/${appId}/resources/${type}`, resources.map((resource) => {
+            var _a, _b, _c;
+            const resourceWithReferences = { ...resource };
+            for (const [referencedProperty, resourceReference] of Object.entries((_a = definition === null || definition === void 0 ? void 0 : definition.references) !== null && _a !== void 0 ? _a : {})) {
+                resourceWithReferences[referencedProperty] =
+                    (_b = publishedResourcesIds[resourceReference.resource]) === null || _b === void 0 ? void 0 : _b[Number((_c = resource[`$${resourceReference.resource}`]) !== null && _c !== void 0 ? _c : -1)];
+            }
+            return resourceWithReferences;
+        }), {
+            baseURL: remote,
+            headers: { 'content-type': 'application/json' },
+        });
+        data = response.data;
+    }
     const ids = [].concat(data).map((d) => d.id);
-    const url = new URL(`/apps/${appId}/resources/${resourceName}/`, remote);
+    const url = new URL(`/apps/${appId}/resources/${type}/`, remote);
     logger.info(`Successfully published ${ids.length} resource${resources.length === 1 ? '' : 's'} at: \n${ids
         .map((id) => `${url}${id}`)
         .join('\n')}`);
+    return ids;
+}
+export async function publishResourcesRecursively({ publishedResourcesIds, remote, resourcesToPublish, }) {
+    let updatedPublishedResourcesIds = { ...publishedResourcesIds };
+    for (const resourceToPublish of resourcesToPublish) {
+        const resourceReferences = resourceToPublish.definition.references;
+        if (resourceReferences) {
+            for (const resourceReference of Object.values(resourceReferences)) {
+                const referencedResourceType = resourceReference.resource;
+                const referencedResourcesToPublish = resourcesToPublish.filter((referencedResourceToPublish) => referencedResourceToPublish.type === referencedResourceType);
+                if (referencedResourcesToPublish.length &&
+                    !updatedPublishedResourcesIds[referencedResourceType]) {
+                    const referencedPublishedResourcesIds = await publishResourcesRecursively({
+                        remote,
+                        resourcesToPublish: referencedResourcesToPublish,
+                        publishedResourcesIds: updatedPublishedResourcesIds,
+                    });
+                    updatedPublishedResourcesIds = {
+                        ...updatedPublishedResourcesIds,
+                        ...referencedPublishedResourcesIds,
+                    };
+                }
+            }
+        }
+        if (!updatedPublishedResourcesIds[resourceToPublish.type]) {
+            updatedPublishedResourcesIds[resourceToPublish.type] = await publishResource({
+                ...resourceToPublish,
+                publishedResourcesIds: updatedPublishedResourcesIds,
+                remote,
+            });
+        }
+    }
+    return updatedPublishedResourcesIds;
 }
 export async function updateResource({ appId, path, remote, resourceName, }) {
     const [file] = await readData(path);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/cli",
-  "version": "0.24.10",
+  "version": "0.24.13",
   "description": "The CLI for developing with Appsemble apps and blocks",
   "keywords": [
     "app",
@@ -42,9 +42,9 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/node-utils": "0.24.10",
-    "@appsemble/types": "0.24.10",
-    "@appsemble/utils": "0.24.10",
+    "@appsemble/node-utils": "0.24.13",
+    "@appsemble/types": "0.24.13",
+    "@appsemble/utils": "0.24.13",
     "@fortawesome/fontawesome-common-types": "^6.0.0",
     "@koa/cors": "^4.0.0",
     "@odata/parser": "^0.2.0",
@@ -86,7 +86,7 @@
     "yargs": "^17.0.0"
   },
   "devDependencies": {
-    "@appsemble/types": "0.24.10",
+    "@appsemble/types": "0.24.13",
     "@types/concat-stream": "^2.0.0",
     "@types/inquirer": "^9.0.0",
     "@types/normalize-path": "^3.0.0",

package/templates/apps/empty/app-definition.yaml

@@ -6,7 +6,7 @@ pages:
   - name: Example Page A
     blocks:
       - type: action-button
-        version: 0.24.10
+        version: 0.24.13
         parameters:
           icon: arrow-right
         actions:
@@ -17,7 +17,7 @@ pages:
   - name: Example Page B
     blocks:
       - type: action-button
-        version: 0.24.10
+        version: 0.24.13
         parameters:
           icon: arrow-left
         actions:

package/templates/blocks/mini-jsx/package.json

@@ -2,7 +2,7 @@
   "private": true,
   "type": "module",
   "dependencies": {
-    "@appsemble/sdk": "0.24.10",
+    "@appsemble/sdk": "0.24.13",
     "mini-jsx": "^4.0.0"
   }
 }

package/templates/blocks/preact/package.json

@@ -2,8 +2,8 @@
   "private": true,
   "type": "module",
   "dependencies": {
-    "@appsemble/preact": "0.24.10",
-    "@appsemble/sdk": "0.24.10",
+    "@appsemble/preact": "0.24.13",
+    "@appsemble/sdk": "0.24.13",
     "preact": "^10.0.0"
   }
 }

package/templates/blocks/vanilla/package.json

@@ -2,6 +2,6 @@
   "private": true,
   "type": "module",
   "dependencies": {
-    "@appsemble/sdk": "0.24.10"
+    "@appsemble/sdk": "0.24.13"
   }
 }