@appsemble/cli 0.27.10 → 0.27.11

package/lib/app.js

@@ -20,12 +20,16 @@ import { publishResourcesRecursively } from './resource.js';
  * Traverses an app directory and appends the files it finds to the given FormData object.
  *
  * @param path The path of the app directory to traverse.
+ * @param context The Context to use from `.appsemblerc.yaml`.
  * @param formData The FormData object to append the results into..
  * @returns The context from `.appsemblerc.yaml` if a match was found.
  */
-export async function traverseAppDirectory(path, formData) {
+export async function traverseAppDirectory(path, context, formData) {
     let rc;
+    let discoveredContext;
     let yaml;
+    let iconPath;
+    let maskableIconPath;
     let controllerPath;
     let controllerBuildConfig;
     let controllerBuildResult;
@@ -60,6 +64,10 @@ export async function traverseAppDirectory(path, formData) {
                     formData.append('iconBackground', rc.iconBackground);
                     gatheredData.iconBackground = rc.iconBackground;
                 }
+                if (context && has(rc === null || rc === void 0 ? void 0 : rc.context, context)) {
+                    discoveredContext = rc.context[context];
+                    logger.verbose(`Using context: ${inspect(discoveredContext, { colors: true })}`);
+                }
                 break;
             case 'app-definition.yaml': {
                 logger.info(`Using app definition from ${filepath}`);
@@ -74,10 +82,12 @@ export async function traverseAppDirectory(path, formData) {
             }
             case 'icon.png':
             case 'icon.svg':
+                iconPath = filepath;
                 gatheredData.iconUrl = filepath;
                 return;
             case 'maskable-icon.png':
-                return;
+                maskableIconPath = filepath;
+                break;
             case 'screenshots':
                 return opendirSafe(filepath, (screenshotPath, screenshotStat) => {
                     if (screenshotStat.isDirectory() &&
@@ -133,7 +143,14 @@ export async function traverseAppDirectory(path, formData) {
     if (yaml === undefined) {
         throw new AppsembleError('No app definition found');
     }
-    return [rc, yaml, gatheredData];
+    discoveredContext || (discoveredContext = {});
+    discoveredContext.icon = discoveredContext.icon
+        ? resolve(path, discoveredContext.icon)
+        : iconPath;
+    discoveredContext.maskableIcon = discoveredContext.maskableIcon
+        ? resolve(path, discoveredContext.maskableIcon)
+        : maskableIconPath;
+    return [discoveredContext, rc, yaml, gatheredData];
 }
 async function retrieveContext(path, context) {
     let rc;
@@ -452,15 +469,45 @@ This block version is not used in the app`);
     }
 }
 /**
- * Update an existing app.
+ * Resolve the app’s ID and remote based on the app context.
  *
- * @param argv The command line options used for updating the app.
+ * @param appPath The path to the app.
+ * @param name Which context to use in the AppsembleRC file.
+ * @param defaultRemote The remote to fall back to.
+ * @param defaultAppId The app ID to fall back to.
+ * @returns The resolved app ID and remote.
  */
-export async function updateApp({ clientCredentials, context, force, path, ...options }) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
+export async function resolveAppIdAndRemote(appPath, name, defaultRemote, defaultAppId) {
+    var _a;
+    let id = defaultAppId;
+    let resolvedRemote = defaultRemote;
+    if (appPath) {
+        const rcPath = join(appPath, '.appsemblerc.yaml');
+        const [rc] = await readData(rcPath);
+        const context = (_a = rc.context) === null || _a === void 0 ? void 0 : _a[name];
+        if (!defaultAppId) {
+            id = context === null || context === void 0 ? void 0 : context.id;
+        }
+        if (context.remote) {
+            resolvedRemote = context.remote;
+        }
+    }
+    if (id == null) {
+        throw new AppsembleError(`App ID was not found in context.${name}.id nor in --app-id`);
+    }
+    return [id, coerceRemote(resolvedRemote)];
+}
+/**
+ * Publish a new app.
+ *
+ * @param options The options to use for publishing an app.
+ */
+export async function publishApp({ clientCredentials, context, dryRun, modifyContext, path, ...options }) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
     const file = await stat(path);
     const formData = new FormData();
     const appsembleContext = await retrieveContext(path, context);
+    let rc;
     let yaml;
     let filename = relative(process.cwd(), path);
     const variant = (_b = (_a = appsembleContext.variant) !== null && _a !== void 0 ? _a : options.variant) !== null && _b !== void 0 ? _b : context;
@@ -473,16 +520,24 @@ export async function updateApp({ clientCredentials, context, force, path, ...op
         logger.warn(`App variant ${variant} is not defined in ${join(path, 'variants')}. Using default app.`);
     }
     if (file.isFile()) {
+        // Assuming file is App YAML
         const [, data] = await readData(appVariantPath);
         yaml = data;
         formData.append('yaml', data);
     }
     else {
-        [, yaml] = await traverseAppDirectory(appVariantPath, formData);
+        let appsembleVariantContext;
+        [appsembleVariantContext, rc, yaml] = await traverseAppDirectory(appVariantPath, context, formData);
+        if (appsembleVariantContext.icon) {
+            appsembleContext.icon = appsembleVariantContext.icon;
+        }
+        if (appsembleVariantContext.maskableIcon) {
+            appsembleContext.maskableIcon = appsembleVariantContext.maskableIcon;
+        }
         filename = join(filename, 'app-definition.yaml');
     }
     const remote = (_c = appsembleContext.remote) !== null && _c !== void 0 ? _c : options.remote;
-    const id = (_d = appsembleContext.id) !== null && _d !== void 0 ? _d : options.id;
+    const organizationId = (_d = appsembleContext.organization) !== null && _d !== void 0 ? _d : options.organization;
     const template = (_f = (_e = appsembleContext.template) !== null && _e !== void 0 ? _e : options.template) !== null && _f !== void 0 ? _f : false;
     const assetsClonable = (_h = (_g = appsembleContext.assetsClonable) !== null && _g !== void 0 ? _g : options.assetsClonable) !== null && _h !== void 0 ? _h : false;
     const demoMode = (_k = (_j = appsembleContext.demoMode) !== null && _j !== void 0 ? _j : options.demoMode) !== null && _k !== void 0 ? _k : false;
@@ -493,23 +548,23 @@ export async function updateApp({ clientCredentials, context, force, path, ...op
     const sentryDsn = (_q = appsembleContext.sentryDsn) !== null && _q !== void 0 ? _q : options.sentryDsn;
     const sentryEnvironment = (_r = appsembleContext.sentryEnvironment) !== null && _r !== void 0 ? _r : options.sentryEnvironment;
     const googleAnalyticsId = (_s = appsembleContext.googleAnalyticsId) !== null && _s !== void 0 ? _s : options.googleAnalyticsId;
-    const resources = (_t = appsembleContext.resources) !== null && _t !== void 0 ? _t : options.resources;
-    const assets = (_u = appsembleContext.assets) !== null && _u !== void 0 ? _u : options.assets;
-    const { appLock } = appsembleContext;
-    logger.info(`App id: ${id}`);
+    const assets = (_t = appsembleContext.assets) !== null && _t !== void 0 ? _t : options.assets;
+    const resources = (_u = appsembleContext.resources) !== null && _u !== void 0 ? _u : options.resources;
+    const appLock = appsembleContext.appLock || 'unlocked';
     logger.verbose(`App remote: ${remote}`);
+    logger.verbose(`App organization: ${organizationId}`);
     logger.verbose(`App is template: ${inspect(template, { colors: true })}`);
     logger.verbose(`App visibility: ${visibility}`);
     logger.verbose(`Icon background: ${iconBackground}`);
-    logger.verbose(`Force update: ${inspect(force, { colors: true })}`);
-    if (!id) {
-        throw new AppsembleError('The app id must be passed as a command line flag or in the context');
+    if (!organizationId) {
+        throw new AppsembleError('An organization id must be passed as a command line flag or in the context');
     }
-    formData.append('force', String(force));
+    formData.append('OrganizationId', organizationId);
     formData.append('template', String(template));
     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 ${(_v = realIcon.path) !== null && _v !== void 0 ? _v : 'stdin'}`);
@@ -536,21 +591,12 @@ export async function updateApp({ clientCredentials, context, force, path, ...op
         authScope += ' resources:write';
     }
     await authenticate(remote, authScope, 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.patch(`/api/apps/${id}`, formData, { baseURL: remote }));
+        ({ data } = await axios.post('/api/apps', formData, {
+            baseURL: remote,
+            params: { dryRun: dryRun || undefined },
+        }));
     }
     catch (error) {
         if (!axios.isAxiosError(error)) {
@@ -561,38 +607,64 @@ export async function updateApp({ clientCredentials, context, force, path, ...op
         }
         throw new AppsembleError(printAxiosError(filename, yaml, error.response.data.data.errors));
     }
-    if (file.isDirectory()) {
-        // After uploading the app, upload block styles and messages if they are available
-        await traverseBlockThemes(appVariantPath, data.id, remote, force);
-        await uploadMessages(appVariantPath, data.id, remote, force);
-        // After updating the app, publish seed resources and assets if they are available
-        if (assets && (data.locked !== 'fullLock' || force)) {
+    if (dryRun) {
+        logger.info('Skipped uploading block themes and app messages.');
+        logger.info('Successfully ran dry run. The app should be valid when creating it.');
+        return;
+    }
+    if (file.isDirectory() && !dryRun) {
+        // After uploading the app, upload block styles, messages if they are available
+        await traverseBlockThemes(appVariantPath, data.id, remote, false);
+        await uploadMessages(appVariantPath, data.id, remote, false);
+        // After uploading the app, publish seed resources and assets if they are available
+        if (assets) {
             await publishSeedAssets(appVariantPath, data, remote, assetsClonable);
         }
-        if (resources && (data.locked !== 'fullLock' || force)) {
+        if (resources) {
             await publishSeedResources(appVariantPath, data, remote);
         }
     }
+    if (modifyContext && appsembleContext && context && !dryRun) {
+        rc.context[context].id = data.id;
+        await writeData(join(appVariantPath, '.appsemblerc.yaml'), rc, { sort: false });
+        logger.info(`Updated .appsemblerc: Set context.${context}.id to ${data.id}`);
+    }
     const { host, protocol } = new URL(remote);
-    logger.info(`Successfully updated app ${data.definition.name}! 🙌`);
+    logger.info(`Successfully published app ${data.definition.name}! 🙌`);
     logger.info(`App URL: ${protocol}//${data.path}.${data.OrganizationId}.${host}`);
     logger.info(`App store page: ${new URL(`/apps/${data.id}`, remote)}`);
-    if (appVariantPath !== path) {
+    const rcCollections = (_0 = (_z = rc === null || rc === void 0 ? void 0 : rc.context) === null || _z === void 0 ? void 0 : _z[context]) === null || _0 === void 0 ? void 0 : _0.collections;
+    if (Array.isArray(rcCollections)) {
+        for (const collectionId of rcCollections) {
+            try {
+                await axios.post(`/api/appCollections/${collectionId}/apps`, { AppId: data.id }, {
+                    baseURL: remote,
+                });
+                logger.info(`Successfully added app to collection ${collectionId}`);
+            }
+            catch (error) {
+                logger.error(error);
+            }
+        }
+    }
+    if (appVariantPath !== path && modifyContext && !dryRun) {
+        const [defaultAppRc] = await readData(join(path, '.appsemblerc.yaml'));
+        defaultAppRc.context[context] = rc.context[context];
+        await writeData(join(path, '.appsemblerc.yaml'), defaultAppRc, { sort: false });
         await rm(appVariantPath, { recursive: true });
         logger.info(`Removed ${appVariantPath}`);
     }
 }
 /**
- * Publish a new app.
+ * Update an existing app.
  *
- * @param options The options to use for publishing an app.
+ * @param argv The command line options used for updating the app.
  */
-export async function publishApp({ clientCredentials, context, dryRun, modifyContext, path, ...options }) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
+export async function updateApp({ clientCredentials, context, force, path, ...options }) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
     const file = await stat(path);
     const formData = new FormData();
     const appsembleContext = await retrieveContext(path, context);
-    let rc;
     let yaml;
     let filename = relative(process.cwd(), path);
     const variant = (_b = (_a = appsembleContext.variant) !== null && _a !== void 0 ? _a : options.variant) !== null && _b !== void 0 ? _b : context;
@@ -605,17 +677,23 @@ export async function publishApp({ clientCredentials, context, dryRun, modifyCon
         logger.warn(`App variant ${variant} is not defined in ${join(path, 'variants')}. Using default app.`);
     }
     if (file.isFile()) {
-        // Assuming file is App YAML
         const [, data] = await readData(appVariantPath);
         yaml = data;
         formData.append('yaml', data);
     }
     else {
-        [rc, yaml] = await traverseAppDirectory(appVariantPath, formData);
+        let appsembleVariantContext;
+        [appsembleVariantContext, , yaml] = await traverseAppDirectory(appVariantPath, context, formData);
+        if (appsembleVariantContext.icon) {
+            appsembleContext.icon = appsembleVariantContext.icon;
+        }
+        if (appsembleVariantContext.maskableIcon) {
+            appsembleContext.maskableIcon = appsembleVariantContext.maskableIcon;
+        }
         filename = join(filename, 'app-definition.yaml');
     }
     const remote = (_c = appsembleContext.remote) !== null && _c !== void 0 ? _c : options.remote;
-    const organizationId = (_d = appsembleContext.organization) !== null && _d !== void 0 ? _d : options.organization;
+    const id = (_d = appsembleContext.id) !== null && _d !== void 0 ? _d : options.id;
     const template = (_f = (_e = appsembleContext.template) !== null && _e !== void 0 ? _e : options.template) !== null && _f !== void 0 ? _f : false;
     const assetsClonable = (_h = (_g = appsembleContext.assetsClonable) !== null && _g !== void 0 ? _g : options.assetsClonable) !== null && _h !== void 0 ? _h : false;
     const demoMode = (_k = (_j = appsembleContext.demoMode) !== null && _j !== void 0 ? _j : options.demoMode) !== null && _k !== void 0 ? _k : false;
@@ -626,23 +704,23 @@ export async function publishApp({ clientCredentials, context, dryRun, modifyCon
     const sentryDsn = (_q = appsembleContext.sentryDsn) !== null && _q !== void 0 ? _q : options.sentryDsn;
     const sentryEnvironment = (_r = appsembleContext.sentryEnvironment) !== null && _r !== void 0 ? _r : options.sentryEnvironment;
     const googleAnalyticsId = (_s = appsembleContext.googleAnalyticsId) !== null && _s !== void 0 ? _s : options.googleAnalyticsId;
-    const assets = (_t = appsembleContext.assets) !== null && _t !== void 0 ? _t : options.assets;
-    const resources = (_u = appsembleContext.resources) !== null && _u !== void 0 ? _u : options.resources;
-    const appLock = appsembleContext.appLock || 'unlocked';
+    const resources = (_t = appsembleContext.resources) !== null && _t !== void 0 ? _t : options.resources;
+    const assets = (_u = appsembleContext.assets) !== null && _u !== void 0 ? _u : options.assets;
+    const { appLock } = appsembleContext;
+    logger.info(`App id: ${id}`);
     logger.verbose(`App remote: ${remote}`);
-    logger.verbose(`App organization: ${organizationId}`);
     logger.verbose(`App is template: ${inspect(template, { colors: true })}`);
     logger.verbose(`App visibility: ${visibility}`);
     logger.verbose(`Icon background: ${iconBackground}`);
-    if (!organizationId) {
-        throw new AppsembleError('An organization id must be passed as a command line flag or in the context');
+    logger.verbose(`Force update: ${inspect(force, { colors: true })}`);
+    if (!id) {
+        throw new AppsembleError('The app id must be passed as a command line flag or in the context');
     }
-    formData.append('OrganizationId', organizationId);
+    formData.append('force', String(force));
     formData.append('template', String(template));
     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 ${(_v = realIcon.path) !== null && _v !== void 0 ? _v : 'stdin'}`);
@@ -669,12 +747,21 @@ export async function publishApp({ clientCredentials, context, dryRun, modifyCon
         authScope += ' resources:write';
     }
     await authenticate(remote, authScope, 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.post('/api/apps', formData, {
-            baseURL: remote,
-            params: { dryRun: dryRun || undefined },
-        }));
+        ({ data } = await axios.patch(`/api/apps/${id}`, formData, { baseURL: remote }));
     }
     catch (error) {
         if (!axios.isAxiosError(error)) {
@@ -685,83 +772,27 @@ export async function publishApp({ clientCredentials, context, dryRun, modifyCon
         }
         throw new AppsembleError(printAxiosError(filename, yaml, error.response.data.data.errors));
     }
-    if (dryRun) {
-        logger.info('Skipped uploading block themes and app messages.');
-        logger.info('Successfully ran dry run. The app should be valid when creating it.');
-        return;
-    }
-    if (file.isDirectory() && !dryRun) {
-        // After uploading the app, upload block styles, messages if they are available
-        await traverseBlockThemes(appVariantPath, data.id, remote, false);
-        await uploadMessages(appVariantPath, data.id, remote, false);
-        // After uploading the app, publish seed resources and assets if they are available
-        if (assets) {
+    if (file.isDirectory()) {
+        // After uploading the app, upload block styles and messages if they are available
+        await traverseBlockThemes(appVariantPath, data.id, remote, force);
+        await uploadMessages(appVariantPath, data.id, remote, force);
+        // After updating the app, publish seed resources and assets if they are available
+        if (assets && (data.locked !== 'fullLock' || force)) {
             await publishSeedAssets(appVariantPath, data, remote, assetsClonable);
         }
-        if (resources) {
+        if (resources && (data.locked !== 'fullLock' || force)) {
             await publishSeedResources(appVariantPath, data, remote);
         }
     }
-    if (modifyContext && appsembleContext && context && !dryRun) {
-        rc.context[context].id = data.id;
-        await writeData(join(appVariantPath, '.appsemblerc.yaml'), rc, { sort: false });
-        logger.info(`Updated .appsemblerc: Set context.${context}.id to ${data.id}`);
-    }
     const { host, protocol } = new URL(remote);
-    logger.info(`Successfully published app ${data.definition.name}! 🙌`);
+    logger.info(`Successfully updated app ${data.definition.name}! 🙌`);
     logger.info(`App URL: ${protocol}//${data.path}.${data.OrganizationId}.${host}`);
     logger.info(`App store page: ${new URL(`/apps/${data.id}`, remote)}`);
-    const rcCollections = (_z = rc.context[context]) === null || _z === void 0 ? void 0 : _z.collections;
-    if (Array.isArray(rcCollections)) {
-        for (const collectionId of rcCollections) {
-            try {
-                await axios.post(`/api/appCollections/${collectionId}/apps`, { AppId: data.id }, {
-                    baseURL: remote,
-                });
-                logger.info(`Successfully added app to collection ${collectionId}`);
-            }
-            catch (error) {
-                logger.error(error);
-            }
-        }
-    }
-    if (appVariantPath !== path && modifyContext && !dryRun) {
-        const [defaultAppRc] = await readData(join(path, '.appsemblerc.yaml'));
-        defaultAppRc.context[context] = rc.context[context];
-        await writeData(join(path, '.appsemblerc.yaml'), defaultAppRc, { sort: false });
+    if (appVariantPath !== path) {
         await rm(appVariantPath, { recursive: true });
         logger.info(`Removed ${appVariantPath}`);
     }
 }
-/**
- * Resolve the app’s ID and remote based on the app context.
- *
- * @param appPath The path to the app.
- * @param name Which context to use in the AppsembleRC file.
- * @param defaultRemote The remote to fall back to.
- * @param defaultAppId The app ID to fall back to.
- * @returns The resolved app ID and remote.
- */
-export async function resolveAppIdAndRemote(appPath, name, defaultRemote, defaultAppId) {
-    var _a;
-    let id = defaultAppId;
-    let resolvedRemote = defaultRemote;
-    if (appPath) {
-        const rcPath = join(appPath, '.appsemblerc.yaml');
-        const [rc] = await readData(rcPath);
-        const context = (_a = rc.context) === null || _a === void 0 ? void 0 : _a[name];
-        if (!defaultAppId) {
-            id = context === null || context === void 0 ? void 0 : context.id;
-        }
-        if (context.remote) {
-            resolvedRemote = context.remote;
-        }
-    }
-    if (id == null) {
-        throw new AppsembleError(`App ID was not found in context.${name}.id nor in --app-id`);
-    }
-    return [id, coerceRemote(resolvedRemote)];
-}
 export async function patchApp({ id, remote, ...options }) {
     const formData = new FormData();
     if (options.path !== undefined) {