@appsemble/cli 0.29.8 → 0.29.9

package/README.md

@@ -1,9 +1,9 @@
-# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.29.8/config/assets/logo.svg) Appsemble CLI
+# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.29.9/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.29.8/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.29.8)
+[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.29.9/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.29.9)
 [![Prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://prettier.io)
 
 ## Table of Contents
@@ -323,5 +323,5 @@ appsemble run-cronjobs --interval 30
 
 ## License
 
-[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.29.8/LICENSE.md) ©
+[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.29.9/LICENSE.md) ©
 [Appsemble](https://appsemble.com)

package/lib/app.js

@@ -206,14 +206,20 @@ async function retrieveContext(path, context) {
  */
 export async function exportAppAsZip(clientCredentials, appId, assets, resources, path, remote) {
     await authenticate(remote, 'apps:export', clientCredentials);
-    const response = await axios.get(`/api/apps/${appId}/export?resources=${resources}&assets=${assets}`, {
-        baseURL: remote,
-        responseType: 'stream',
-    });
-    const zipFileName = join(path, String(extractFilenameFromContentDisposition(response.headers['content-disposition'])));
-    const writeStream = createWriteStream(zipFileName);
-    response.data.pipe(writeStream);
-    logger.info(`Successfully downloaded file: ${zipFileName}`);
+    try {
+        const response = await axios.get(`/api/apps/${appId}/export?resources=${resources}&assets=${assets}`, {
+            baseURL: remote,
+            responseType: 'stream',
+        });
+        const zipFileName = join(path, String(extractFilenameFromContentDisposition(response.headers['content-disposition'])));
+        const writeStream = createWriteStream(zipFileName);
+        response.data.pipe(writeStream);
+        logger.info(`Successfully downloaded file: ${zipFileName}`);
+    }
+    catch (error) {
+        logger.error(error);
+        throw error;
+    }
 }
 /**
  * Upload messages for an app.
@@ -238,20 +244,32 @@ export async function uploadMessages(path, appId, remote, force) {
     if (!result.length) {
         logger.info('No translations found 🤷');
     }
-    for (const language of result) {
-        await axios.post(`/api/apps/${appId}/messages`, language, { baseURL: remote });
-        logger.info(`Successfully uploaded messages for language “${language.language}” 🎉`);
+    try {
+        for (const language of result) {
+            await axios.post(`/api/apps/${appId}/messages`, language, { baseURL: remote });
+            logger.info(`Successfully uploaded messages for language “${language.language}” 🎉`);
+        }
+    }
+    catch (error) {
+        logger.error(error);
+        throw error;
     }
 }
 export async function deleteApp({ clientCredentials, id, remote }) {
     await authenticate(remote, 'apps:delete', clientCredentials);
-    const response = await axios.get(`/api/apps/${id}`);
-    const { name } = response.data;
-    logger.warn(`Deleting app: ${name}`);
-    await axios.delete(`/api/apps/${id}`, {
-        baseURL: remote,
-    });
-    logger.info(`Successfully deleted app with id ${id}`);
+    try {
+        const response = await axios.get(`/api/apps/${id}`);
+        const { name } = response.data;
+        logger.warn(`Deleting app: ${name}`);
+        await axios.delete(`/api/apps/${id}`, {
+            baseURL: remote,
+        });
+        logger.info(`Successfully deleted app with id ${id}`);
+    }
+    catch (error) {
+        logger.error(error);
+        throw error;
+    }
 }
 export async function publishSeedResources(path, app, remote) {
     var _a, _b;
@@ -610,7 +628,7 @@ export async function writeAppMessages(path, languages, verify, format) {
         }));
         const appMessagePrefixes = Object.keys(newAppMessages);
         for (const [key, message] of Object.entries(oldMessages.app)) {
-            const match = /^(pages\.\d+(\..+)?)\.blocks\.\d+.+/.exec(key);
+            const match = /^(pages\.[\dA-Za-z-]+(\..+)?)\.blocks\.\d+.+/.exec(key);
             if (!match) {
                 continue;
             }
@@ -953,7 +971,7 @@ export async function updateApp({ clientCredentials, context, force, path, ...op
         }
         catch (error) {
             logger.error(error);
-            process.exit(1);
+            throw error;
         }
     }
     let data;

package/lib/asset.js

@@ -4,15 +4,21 @@ import { normalize } from '@appsemble/utils';
 import axios from 'axios';
 import FormData from 'form-data';
 export async function publishAsset({ appId, clonable, name, path, remote, seed, }) {
-    const formData = new FormData();
-    const file = createReadStream(path);
-    formData.append('file', file);
-    formData.append('clonable', String(clonable));
-    if (name) {
-        formData.append('name', normalize(name));
+    try {
+        const formData = new FormData();
+        const file = createReadStream(path);
+        formData.append('file', file);
+        formData.append('clonable', String(clonable));
+        if (name) {
+            formData.append('name', normalize(name));
+        }
+        const endpoint = `/api/apps/${appId}/${seed ? 'seed-' : ''}assets`;
+        const { data: { id }, } = await axios.post(endpoint, formData, { baseURL: remote });
+        logger.info(`Published asset ${id}${name ? ` with name ${normalize(name)}` : ''}`);
+    }
+    catch (error) {
+        logger.error(error);
+        throw error;
     }
-    const endpoint = `/api/apps/${appId}/${seed ? 'seed-' : ''}assets`;
-    const { data: { id }, } = await axios.post(endpoint, formData, { baseURL: remote });
-    logger.info(`Published asset ${id}${name ? ` with name ${normalize(name)}` : ''}`);
 }
 //# sourceMappingURL=asset.js.map

package/lib/block.js

@@ -49,11 +49,17 @@ export async function buildBlock(buildConfig, env) {
     });
 }
 export async function deleteBlock({ blockName, blockVersion, clientCredentials, organization, remote, }) {
-    await authenticate(remote, 'blocks:delete', clientCredentials);
-    await axios.delete(`/api/blocks/@${organization}/${blockName}/versions/${blockVersion}`, {
-        baseURL: remote,
-    });
-    logger.info(`Successfully deleted ${blockName} block version.`);
+    try {
+        await authenticate(remote, 'blocks:delete', clientCredentials);
+        await axios.delete(`/api/blocks/@${organization}/${blockName}/versions/${blockVersion}`, {
+            baseURL: remote,
+        });
+        logger.info(`Successfully deleted ${blockName} block version.`);
+    }
+    catch (error) {
+        logger.error(error);
+        throw error;
+    }
 }
 /**
  * Uploads an app block theme
@@ -68,7 +74,13 @@ export async function deleteBlock({ blockName, blockVersion, clientCredentials,
 export async function uploadAppBlockTheme(filePath, organization, appId, block, remote, force) {
     logger.info(`Upload ${organization}/${block} stylesheet for app ${appId}`);
     const style = await processCss(filePath);
-    await axios.post(`/api/apps/${appId}/style/block/${organization}/${block}`, { force, style }, { baseURL: remote });
+    try {
+        await axios.post(`/api/apps/${appId}/style/block/${organization}/${block}`, { force, style }, { baseURL: remote });
+    }
+    catch (error) {
+        logger.error(error);
+        throw error;
+    }
     logger.info(`Upload of ${organization}/${block} stylesheet successful! 🎉`);
 }
 /**

package/lib/organization.js

@@ -25,8 +25,14 @@ export async function createOrganization({ description, email, icon, id, name, w
         formData.append('website', website);
     }
     logger.info(`Creating organization ${id}${name ? ` (${name})` : ''}`);
-    await axios.post('/api/organizations', formData);
-    logger.info(`Successfully created organization ${id}${name ? ` (${name})` : ''}`);
+    try {
+        await axios.post('/api/organizations', formData);
+        logger.info(`Successfully created organization ${id}${name ? ` (${name})` : ''}`);
+    }
+    catch (error) {
+        logger.error(error);
+        throw error;
+    }
 }
 export async function updateOrganization({ description, email, icon, id, name, website, }) {
     logger.info(`Updating organization ${id}${name ? ` (${name})` : ''}`);
@@ -51,8 +57,14 @@ export async function updateOrganization({ description, email, icon, id, name, w
         logger.info(`Setting website to ${website}`);
         formData.append('website', website);
     }
-    await axios.patch(`/api/organizations/${id}`, formData);
-    logger.info(`Successfully updated organization ${id}${name ? ` (${name})` : ''}`);
+    try {
+        await axios.patch(`/api/organizations/${id}`, formData);
+        logger.info(`Successfully updated organization ${id}${name ? ` (${name})` : ''}`);
+    }
+    catch (error) {
+        logger.error(error);
+        throw error;
+    }
 }
 export async function upsertOrganization({ description, email, icon, id, name, website, }) {
     var _a;

package/lib/resource.js

@@ -17,27 +17,33 @@ export async function publishResource({ appId, definition, path, publishedResour
     logger.info(`Publishing resource(s) from ${path}`);
     let data;
     const endpoint = `/api/apps/${appId}/${seed ? 'seed-' : ''}resources/${type}`;
-    if (csv) {
-        const response = await axios.post(endpoint, resources, {
-            baseURL: remote,
-            headers: { 'content-type': 'text/csv' },
-        });
-        data = response.data;
+    try {
+        if (csv) {
+            const response = await axios.post(endpoint, resources, {
+                baseURL: remote,
+                headers: { 'content-type': 'text/csv' },
+            });
+            data = response.data;
+        }
+        else {
+            const response = await axios.post(endpoint, 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;
+        }
     }
-    else {
-        const response = await axios.post(endpoint, 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;
+    catch (error) {
+        logger.error(error);
+        throw error;
     }
     const ids = [].concat(data).map((d) => d.id);
     const url = new URL(`/apps/${appId}/resources/${type}/`, remote);
@@ -92,10 +98,16 @@ export async function updateResource({ appId, path, remote, resourceName, }) {
             logger.info(`Skipping resource ${resources.indexOf(resource)} because it has no ID.`);
             continue;
         }
-        const { data: { id }, } = await axios.put(`/api/apps/${appId}/resources/${resourceName}/${resource.id}`, resource, {
-            baseURL: remote,
-        });
-        logger.info(`Successfully updated resource ${id} at ${new URL(`/apps/${appId}/resources/${resourceName}/${id}`, remote)}`);
+        try {
+            const { data: { id }, } = await axios.put(`/api/apps/${appId}/resources/${resourceName}/${resource.id}`, resource, {
+                baseURL: remote,
+            });
+            logger.info(`Successfully updated resource ${id} at ${new URL(`/apps/${appId}/resources/${resourceName}/${id}`, remote)}`);
+        }
+        catch (error) {
+            logger.error(error);
+            throw error;
+        }
     }
 }
 //# sourceMappingURL=resource.js.map

package/lib/team.js

@@ -15,35 +15,65 @@ export function resolveAnnotations(annotations) {
 export async function createTeam({ annotations = [], appId, clientCredentials, name, remote, }) {
     logger.info(`Creating team ${name}`);
     await authenticate(remote, 'teams:write', clientCredentials);
-    const { data: { id }, } = await axios.post(`/api/apps/${appId}/teams`, {
-        name,
-        annotations: resolveAnnotations(annotations),
-    }, { baseURL: remote });
-    logger.info(`Successfully created team ${name} with ID ${id}`);
+    try {
+        const { data: { id }, } = await axios.post(`/api/apps/${appId}/teams`, {
+            name,
+            annotations: resolveAnnotations(annotations),
+        }, { baseURL: remote });
+        logger.info(`Successfully created team ${name} with ID ${id}`);
+    }
+    catch (error) {
+        logger.error(error);
+        throw error;
+    }
 }
 export async function deleteTeam({ appId, clientCredentials, id, remote, }) {
     await authenticate(remote, 'teams:write', clientCredentials);
     logger.info(`Deleting team ${id}`);
-    await axios.delete(`/api/apps/${appId}/teams/${id}`, { baseURL: remote });
-    logger.info(`Successfully deleted team ${id}`);
+    try {
+        await axios.delete(`/api/apps/${appId}/teams/${id}`, { baseURL: remote });
+        logger.info(`Successfully deleted team ${id}`);
+    }
+    catch (error) {
+        logger.error(error);
+        throw error;
+    }
 }
 export async function updateTeam({ annotations = [], appId, id, name, remote, }) {
     logger.info(`Updating team ${id}`);
-    await axios.patch(`/api/apps/${appId}/teams/${id}`, {
-        name,
-        annotations: resolveAnnotations(annotations),
-    }, { baseURL: remote });
-    logger.info(`Successfully updated team ${id}`);
+    try {
+        await axios.patch(`/api/apps/${appId}/teams/${id}`, {
+            name,
+            annotations: resolveAnnotations(annotations),
+        }, { baseURL: remote });
+        logger.info(`Successfully updated team ${id}`);
+    }
+    catch (error) {
+        logger.error(error);
+        throw error;
+    }
 }
 export async function inviteMember({ appId, id, remote, user, }) {
     logger.info(`Inviting ${user} to team ${id}`);
-    await axios.post(`/api/apps/${appId}/teams/${id}/members`, { id: user }, { baseURL: remote });
-    logger.info(`Successfully invited ${user} to team ${id}`);
+    try {
+        await axios.post(`/api/apps/${appId}/teams/${id}/members`, { id: user }, { baseURL: remote });
+        logger.info(`Successfully invited ${user} to team ${id}`);
+    }
+    catch (error) {
+        logger.error(error);
+        throw error;
+    }
 }
 export async function updateMember({ appId, id, remote, role, user, }) {
     logger.info(`Updating ${user}’s role in team ${id} to ${role}`);
-    await axios.put(`/api/apps/${appId}/teams/${id}/members/${user}`, { role }, { baseURL: remote });
-    logger.info(`Successfully updated ${user} in team ${id}`);
+    try {
+        await axios.put(`/api/apps/${appId}/teams/${id}/members/${user}`, { role }, { baseURL: remote });
+        logger.info(`Successfully updated ${user} in team ${id}`);
+    }
+    catch (error) {
+        logger.error(error);
+        throw error;
+    }
 }
 export async function deleteMember({ appId, id, user }) {
     logger.info(`Deleting ${user} to team ${id}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/cli",
-  "version": "0.29.8",
+  "version": "0.29.9",
   "description": "The CLI for developing with Appsemble apps and blocks",
   "keywords": [
     "app",
@@ -42,9 +42,9 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/node-utils": "0.29.8",
-    "@appsemble/types": "0.29.8",
-    "@appsemble/utils": "0.29.8",
+    "@appsemble/node-utils": "0.29.9",
+    "@appsemble/types": "0.29.9",
+    "@appsemble/utils": "0.29.9",
     "@fortawesome/fontawesome-common-types": "^6.0.0",
     "@koa/cors": "^4.0.0",
     "@odata/parser": "^0.2.0",
@@ -87,8 +87,8 @@
     "yargs": "^17.0.0"
   },
   "devDependencies": {
-    "@appsemble/types": "0.29.8",
-    "@appsemble/server": "0.29.8",
+    "@appsemble/types": "0.29.9",
+    "@appsemble/server": "0.29.9",
     "bcrypt": "^5.0.0",
     "axios-test-instance": "^7.0.0",
     "@types/concat-stream": "^2.0.0",

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

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

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

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

package/templates/blocks/preact/package.json

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

package/templates/blocks/vanilla/package.json

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