@appsemble/cli 0.26.0 → 0.27.1

package/README.md

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

package/commands/app/publish.js

@@ -40,26 +40,25 @@ export function builder(yargs) {
         .option('demo-mode', {
         describe: 'Whether the app should be used in demo mode.',
         type: 'boolean',
-    })
-        .option('seed', {
-        describe: 'Whether to enable seeding for an app or not.',
-        implies: ['demo-mode'],
     })
         .option('dry-run', {
         describe: 'Whether the API should be called to run without actually creating the app.',
         type: 'boolean',
     })
         .option('resources', {
-        describe: 'Whether the resources from the `resources` directory should be created after publishing the app. The names of subdirectories are used as the name of the resource, otherwise the names of top level resource .json files are used instead.',
+        describe: 'Whether the resources from the `resources` directory should be created after publishing the app. The names of sub-directories are used as the name of the resource, otherwise the names of top level resource .json files are used instead.',
         type: 'boolean',
     })
         .option('assets', {
         describe: 'Whether the assets from the `assets` directory should be created after publishing the app.',
         type: 'boolean',
+        default: false,
     })
         .option('assets-clonable', {
         describe: 'Whether published assets should be clonable. Ignored if assets equals false.',
         type: 'boolean',
+        default: false,
+        implies: 'assets',
     })
         .option('modify-context', {
         describe: 'If the app context is specified, modify it for the current context to include the id of the published app.',

package/commands/app/update.d.ts

@@ -13,7 +13,9 @@ interface UpdateAppArguments extends BaseArguments {
     id: number;
     template: boolean;
     demoMode: boolean;
-    seed: boolean;
+    resources: boolean;
+    assets: boolean;
+    assetsClonable: boolean;
     force: boolean;
     visibility: AppVisibility;
     sentryDsn: string;

package/commands/app/update.js

@@ -1,4 +1,4 @@
-import { AppsembleError, authenticate, logger } from '@appsemble/node-utils';
+import { AppsembleError, logger } from '@appsemble/node-utils';
 import fg from 'fast-glob';
 import normalizePath from 'normalize-path';
 import { updateApp } from '../../lib/app.js';
@@ -44,9 +44,20 @@ export function builder(yargs) {
         describe: 'Whether the app should be used in demo mode.',
         type: 'boolean',
     })
-        .option('seed', {
-        describe: 'Whether to enable seeding for an app or not.',
-        implies: ['demo-mode'],
+        .option('resources', {
+        describe: 'Whether the resources from the `resources` directory should replace the seed resources of the app being updated. The names of sub-directories are used as the name of the resource, otherwise the names of top level resource .json files are used instead.',
+        type: 'boolean',
+    })
+        .option('assets', {
+        describe: 'Whether the assets from the `assets` directory should replace the seed assets of the app being updated.',
+        type: 'boolean',
+        default: false,
+    })
+        .option('assets-clonable', {
+        describe: 'Whether published assets should be clonable. Ignored if assets equals false.',
+        type: 'boolean',
+        default: false,
+        implies: 'assets',
     })
         .option('force', {
         describe: 'Whether the lock property should be ignored.',
@@ -70,7 +81,6 @@ export async function handler({ clientCredentials, id, paths, remote, ...args })
     }
     const normalizedPaths = paths.map((path) => normalizePath(path));
     const directories = await fg(normalizedPaths, { absolute: true, onlyDirectories: true });
-    await authenticate(remote, 'apps:write', clientCredentials);
     logger.info(`Updating ${directories.length} apps`);
     for (const dir of directories) {
         await updateApp({

package/commands/asset/publish.d.ts

@@ -8,9 +8,10 @@ interface PublishAssetArguments extends BaseArguments {
     context: string;
     app: string;
     clonable: boolean;
+    seed: boolean;
 }
 export declare const command = "publish <paths...>";
 export declare const description = "Publish assets for an existing app.";
 export declare function builder(yargs: Argv): Argv<any>;
-export declare function handler({ app, appId, clientCredentials, clonable, context, name, paths, remote, useFileName, }: PublishAssetArguments): Promise<void>;
+export declare function handler({ app, appId, clientCredentials, clonable, context, name, paths, remote, seed, useFileName, }: PublishAssetArguments): Promise<void>;
 export {};

package/commands/asset/publish.js

@@ -35,9 +35,13 @@ export function builder(yargs) {
         type: 'boolean',
         default: false,
         describe: 'If true, all published assets will be clonable',
+    })
+        .option('seed', {
+        describe: 'If true, published resources will be used as seed',
+        default: false,
     });
 }
-export async function handler({ app, appId, clientCredentials, clonable, context, name, paths, remote, useFileName, }) {
+export async function handler({ app, appId, clientCredentials, clonable, context, name, paths, remote, seed, useFileName, }) {
     const [resolvedAppId, resolvedRemote] = await resolveAppIdAndRemote(app, context, remote, appId);
     await authenticate(resolvedRemote, 'assets:write', clientCredentials);
     const normalizedPaths = paths.map((path) => normalizePath(path));
@@ -52,6 +56,7 @@ export async function handler({ app, appId, clientCredentials, clonable, context
             name: name || (useFileName ? parse(path).name : null),
             appId: resolvedAppId,
             path,
+            seed,
             remote: resolvedRemote,
             clonable,
         });

package/commands/resource/publish.d.ts

@@ -6,9 +6,10 @@ interface PublishResourceArguments extends BaseArguments {
     appId: number;
     context: string;
     app: string;
+    seed: boolean;
 }
 export declare const command = "publish <resource-name> <paths...>";
 export declare const description = "Publish resources based on a specified JSON file or directory.";
 export declare function builder(yargs: Argv): Argv<any>;
-export declare function handler({ app, appId, clientCredentials, context, paths, remote, resourceName, }: PublishResourceArguments): Promise<void>;
+export declare function handler({ app, appId, clientCredentials, context, paths, remote, resourceName, seed, }: PublishResourceArguments): Promise<void>;
 export {};

package/commands/resource/publish.js

@@ -27,9 +27,13 @@ export function builder(yargs) {
         .option('context', {
         describe: 'If specified, use the specified context from .appsemblerc.yaml',
         demandOption: 'app',
+    })
+        .option('seed', {
+        describe: 'If true, published resources will be used as seed',
+        default: false,
     });
 }
-export async function handler({ app, appId, clientCredentials, context, paths, remote, resourceName, }) {
+export async function handler({ app, appId, clientCredentials, context, paths, remote, resourceName, seed, }) {
     const [resolvedAppId, resolvedRemote] = await resolveAppIdAndRemote(app, context, remote, appId);
     await authenticate(resolvedRemote, 'resources:write', clientCredentials);
     const normalizedPaths = paths.map((path) => normalizePath(path));
@@ -43,8 +47,9 @@ export async function handler({ app, appId, clientCredentials, context, paths, r
         await publishResource({
             type: resourceName,
             appId: resolvedAppId,
-            path,
             remote: resolvedRemote,
+            path,
+            seed,
         });
     }
 }

package/lib/app.d.ts

@@ -120,9 +120,17 @@ interface UpdateAppParams {
      */
     demoMode: boolean;
     /**
-     * Whether the App should seed resources and assets in demo mode.
+     * Whether resources from the `resources` directory should be published after publishing the app.
      */
-    seed: boolean;
+    resources: boolean;
+    /**
+     * Whether assets from the `assets` directory should be published after publishing the app.
+     */
+    assets: boolean;
+    /**
+     * Whether published assets should be clonable. Ignored if `assets` equals false.
+     */
+    assetsClonable: boolean;
     /**
      * Whether the locked property should be ignored.
      */
@@ -180,6 +188,8 @@ export declare function exportAppAsZip(appId: number, assets: boolean, resources
  * @param force Whether or not to force the update for locked apps.
  */
 export declare function uploadMessages(path: string, appId: number, remote: string, force: boolean): Promise<void>;
+export declare function publishSeedResources(path: string, app: App, remote: string): Promise<void>;
+export declare function publishSeedAssets(path: string, app: App, remote: string, assetsClonable: boolean): Promise<void>;
 /**
  * @param path The path to the app directory.
  * @param languages A list of languages for which translations should be added in addition to the
@@ -193,13 +203,13 @@ export declare function writeAppMessages(path: string, languages: string[], veri
  *
  * @param argv The command line options used for updating the app.
  */
-export declare function updateApp({ clientCredentials, context, force, path, ...options }: UpdateAppParams): Promise<void>;
+export declare function updateApp({ assets, clientCredentials, context, force, path, resources, ...options }: UpdateAppParams): Promise<void>;
 /**
  * Publish a new app.
  *
  * @param options The options to use for publishing an app.
  */
-export declare function publishApp({ assets, assetsClonable, clientCredentials, context, dryRun, modifyContext, path, resources, ...options }: PublishAppParams): Promise<void>;
+export declare function publishApp({ assets, clientCredentials, context, dryRun, modifyContext, path, resources, ...options }: PublishAppParams): Promise<void>;
 /**
  * Resolve the app’s ID and remote based on the app context.
  *

package/lib/app.js

@@ -1,14 +1,13 @@
 import { createReadStream, createWriteStream, existsSync } from 'node:fs';
-import { mkdir, readdir, readFile, stat } from 'node:fs/promises';
-import { basename, join, parse, relative, resolve } from 'node:path';
+import { mkdir, readdir, readFile, rm, stat } from 'node:fs/promises';
+import { basename, dirname, join, parse, relative, resolve } from 'node:path';
 import { inspect } from 'node:util';
-import { AppsembleError, authenticate, logger, opendirSafe, readData, writeData, } from '@appsemble/node-utils';
+import { applyAppVariant, AppsembleError, authenticate, logger, opendirSafe, readData, writeData, } from '@appsemble/node-utils';
 import { extractAppMessages, has, normalizeBlockName } from '@appsemble/utils';
 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';
@@ -176,6 +175,88 @@ export async function uploadMessages(path, appId, remote, force) {
         logger.info(`Successfully uploaded messages for language “${language.language}” 🎉`);
     }
 }
+export async function publishSeedResources(path, app, remote) {
+    var _a, _b;
+    const resourcesPath = join(path, 'resources');
+    logger.info(`Publishing seed resources from ${resourcesPath}`);
+    if (existsSync(resourcesPath)) {
+        logger.info(`Deleting existing seed resources from app ${app.id}`);
+        await axios.delete(`/api/apps/${app.id}/seed-resources`);
+        try {
+            const resourceFiles = await readdir(resourcesPath, { withFileTypes: true });
+            const resourcesToPublish = [];
+            const publishedResourcesIds = {};
+            for (const resource of resourceFiles) {
+                if (resource.isFile()) {
+                    const { name } = parse(resource.name);
+                    resourcesToPublish.push({
+                        appId: app.id,
+                        path: join(resourcesPath, resource.name),
+                        definition: (_a = app.definition.resources) === null || _a === void 0 ? void 0 : _a[name],
+                        type: name,
+                    });
+                }
+                else if (resource.isDirectory()) {
+                    const subDirectoryResources = await readdir(join(resourcesPath, resource.name), {
+                        withFileTypes: true,
+                    });
+                    for (const subResource of subDirectoryResources.filter((s) => s.isFile())) {
+                        resourcesToPublish.push({
+                            appId: app.id,
+                            path: join(resourcesPath, resource.name, subResource.name),
+                            definition: (_b = app.definition.resources) === null || _b === void 0 ? void 0 : _b[resource.name],
+                            type: resource.name,
+                        });
+                    }
+                }
+            }
+            await publishResourcesRecursively({
+                seed: true,
+                remote,
+                resourcesToPublish,
+                publishedResourcesIds,
+            });
+        }
+        catch (error) {
+            logger.error('Something went wrong when publishing seed resources:');
+            logger.error(error);
+        }
+    }
+    else {
+        logger.warn(`Missing resources directory in ${path}. Skipping...`);
+    }
+}
+export async function publishSeedAssets(path, app, remote, assetsClonable) {
+    const assetsPath = join(path, 'assets');
+    logger.info(`Publishing seed assets from ${assetsPath}`);
+    if (existsSync(assetsPath)) {
+        logger.info(`Deleting existing seed assets from app ${app.id}`);
+        await axios.delete(`/api/apps/${app.id}/seed-assets`);
+        const assetFiles = await readdir(assetsPath);
+        const normalizedPaths = assetFiles.map((assetFile) => normalizePath(join(assetsPath, assetFile)));
+        const files = await fg(normalizedPaths, { absolute: true, onlyFiles: true });
+        try {
+            logger.info(`Publishing ${files.length} asset(s)`);
+            for (const assetFilePath of files) {
+                await publishAsset({
+                    name: parse(assetFilePath).name,
+                    appId: app.id,
+                    path: assetFilePath,
+                    remote,
+                    seed: true,
+                    clonable: assetsClonable,
+                });
+            }
+        }
+        catch (error) {
+            logger.error('Something went wrong when creating assets:');
+            logger.error(error);
+        }
+    }
+    else {
+        logger.warn(`Missing assets directory in ${path}. Skipping...`);
+    }
+}
 /**
  * @param path The path to the app directory.
  * @param languages A list of languages for which translations should be added in addition to the
@@ -331,32 +412,38 @@ This block version is not used in the app`);
  *
  * @param argv The command line options used for updating the app.
  */
-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;
+export async function updateApp({ assets, clientCredentials, context, force, path, resources, ...options }) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
     const file = await stat(path);
     const formData = new FormData();
     let appsembleContext;
+    let appVariantPath = path;
+    if (existsSync(join(path, 'variants', context))) {
+        await applyAppVariant(path, context);
+        appVariantPath = join(dirname(path), `${basename(path)}-${context}`);
+    }
+    else {
+        logger.warn(`App variant ${context} is not defined. Using default app.`);
+    }
     if (file.isFile()) {
-        const [, data] = await readData(path);
+        const [, data] = await readData(appVariantPath);
         formData.append('yaml', data);
     }
     else {
-        [appsembleContext] = await traverseAppDirectory(path, context, formData);
+        [appsembleContext] = await traverseAppDirectory(appVariantPath, context, formData);
     }
     const remote = (_a = appsembleContext.remote) !== null && _a !== void 0 ? _a : options.remote;
     const id = (_b = appsembleContext.id) !== null && _b !== void 0 ? _b : options.id;
     const template = (_d = (_c = appsembleContext.template) !== null && _c !== void 0 ? _c : options.template) !== null && _d !== void 0 ? _d : false;
-    const demoMode = (_f = (_e = appsembleContext.demoMode) !== null && _e !== void 0 ? _e : options.demoMode) !== null && _f !== void 0 ? _f : false;
-    // TODO: seed depends on demoMode, this is caused by bad database normalization.
-    // Consider using a property called `type` on the App model instead.
-    const seed = (_j = (_h = (_g = appsembleContext.seed) !== null && _g !== void 0 ? _g : options.seed) !== null && _h !== void 0 ? _h : options.demoMode) !== null && _j !== void 0 ? _j : false;
-    const visibility = (_k = appsembleContext.visibility) !== null && _k !== void 0 ? _k : options.visibility;
-    const iconBackground = (_l = appsembleContext.iconBackground) !== null && _l !== void 0 ? _l : options.iconBackground;
-    const icon = (_m = options.icon) !== null && _m !== void 0 ? _m : appsembleContext.icon;
-    const maskableIcon = (_o = options.maskableIcon) !== null && _o !== void 0 ? _o : appsembleContext.maskableIcon;
-    const sentryDsn = (_p = appsembleContext.sentryDsn) !== null && _p !== void 0 ? _p : options.sentryDsn;
-    const sentryEnvironment = (_q = appsembleContext.sentryEnvironment) !== null && _q !== void 0 ? _q : options.sentryEnvironment;
-    const googleAnalyticsId = (_r = appsembleContext.googleAnalyticsId) !== null && _r !== void 0 ? _r : options.googleAnalyticsId;
+    const assetsClonable = (_f = (_e = appsembleContext.assetsClonable) !== null && _e !== void 0 ? _e : options.assetsClonable) !== null && _f !== void 0 ? _f : false;
+    const demoMode = (_h = (_g = appsembleContext.demoMode) !== null && _g !== void 0 ? _g : options.demoMode) !== null && _h !== void 0 ? _h : false;
+    const visibility = (_j = appsembleContext.visibility) !== null && _j !== void 0 ? _j : options.visibility;
+    const iconBackground = (_k = appsembleContext.iconBackground) !== null && _k !== void 0 ? _k : options.iconBackground;
+    const icon = (_l = options.icon) !== null && _l !== void 0 ? _l : appsembleContext.icon;
+    const maskableIcon = (_m = options.maskableIcon) !== null && _m !== void 0 ? _m : appsembleContext.maskableIcon;
+    const sentryDsn = (_o = appsembleContext.sentryDsn) !== null && _o !== void 0 ? _o : options.sentryDsn;
+    const sentryEnvironment = (_p = appsembleContext.sentryEnvironment) !== null && _p !== void 0 ? _p : options.sentryEnvironment;
+    const googleAnalyticsId = (_q = appsembleContext.googleAnalyticsId) !== null && _q !== void 0 ? _q : options.googleAnalyticsId;
     const { appLock } = appsembleContext;
     logger.info(`App id: ${id}`);
     logger.verbose(`App remote: ${remote}`);
@@ -370,17 +457,16 @@ export async function updateApp({ clientCredentials, context, force, path, ...op
     formData.append('force', String(force));
     formData.append('template', String(template));
     formData.append('demoMode', String(demoMode));
-    formData.append('seed', String(seed));
     formData.append('visibility', visibility);
     formData.append('iconBackground', iconBackground);
     if (icon) {
         const realIcon = typeof icon === 'string' ? createReadStream(icon) : icon;
-        logger.info(`Using icon from ${(_s = realIcon.path) !== null && _s !== void 0 ? _s : 'stdin'}`);
+        logger.info(`Using icon from ${(_r = realIcon.path) !== null && _r !== void 0 ? _r : 'stdin'}`);
         formData.append('icon', realIcon);
     }
     if (maskableIcon) {
         const realIcon = typeof maskableIcon === 'string' ? createReadStream(maskableIcon) : maskableIcon;
-        logger.info(`Using maskable icon from ${(_t = realIcon.path) !== null && _t !== void 0 ? _t : 'stdin'}`);
+        logger.info(`Using maskable icon from ${(_s = realIcon.path) !== null && _s !== void 0 ? _s : 'stdin'}`);
         formData.append('maskableIcon', realIcon);
     }
     if (sentryDsn) {
@@ -394,7 +480,11 @@ export async function updateApp({ clientCredentials, context, force, path, ...op
         logger.info('Using Google Analytics');
         formData.append('googleAnalyticsID', googleAnalyticsId);
     }
-    await authenticate(remote, 'apps:write', clientCredentials);
+    let authScope = 'apps:write';
+    if (resources) {
+        authScope += ' resources:write';
+    }
+    await authenticate(remote, authScope, clientCredentials);
     if (appLock) {
         logger.info(`Setting AppLock to ${appLock}`);
         try {
@@ -417,7 +507,7 @@ export async function updateApp({ clientCredentials, context, force, path, ...op
         if (!axios.isAxiosError(error)) {
             throw error;
         }
-        if (((_v = (_u = error.response) === null || _u === void 0 ? void 0 : _u.data) === null || _v === void 0 ? void 0 : _v.message) !== 'App validation failed') {
+        if (((_u = (_t = error.response) === null || _t === void 0 ? void 0 : _t.data) === null || _u === void 0 ? void 0 : _u.message) !== 'App validation failed') {
             throw error;
         }
         logger.error(error.response.data);
@@ -425,51 +515,68 @@ export async function updateApp({ clientCredentials, context, force, path, ...op
     }
     if (file.isDirectory()) {
         // After uploading the app, upload block styles and messages if they are available
-        await traverseBlockThemes(path, data.id, remote, force);
-        await uploadMessages(path, data.id, remote, force);
+        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 && (data.locked !== 'fullLock' || force)) {
+            await publishSeedResources(appVariantPath, data, remote);
+        }
     }
     const { host, protocol } = new URL(remote);
     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)}`);
+    if (appVariantPath !== path) {
+        await rm(appVariantPath, { recursive: true });
+        logger.info(`Removed ${appVariantPath}`);
+    }
 }
 /**
  * Publish a new app.
  *
  * @param options The options to use for publishing an app.
  */
-export async function publishApp({ assets, assetsClonable, clientCredentials, context, dryRun, modifyContext, path, resources, ...options }) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
+export async function publishApp({ assets, clientCredentials, context, dryRun, modifyContext, path, resources, ...options }) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
     const file = await stat(path);
     const formData = new FormData();
     let appsembleContext;
     let rc;
     let yaml;
     let filename = relative(process.cwd(), path);
+    let appVariantPath = path;
+    if (existsSync(join(path, 'variants', context))) {
+        await applyAppVariant(path, context);
+        appVariantPath = join(dirname(path), `${basename(path)}-${context}`);
+    }
+    else {
+        logger.warn(`App variant ${context} is not defined. Using default app.`);
+    }
     if (file.isFile()) {
         // Assuming file is App YAML
-        const [, data] = await readData(path);
+        const [, data] = await readData(appVariantPath);
         yaml = data;
         formData.append('yaml', data);
     }
     else {
-        [appsembleContext, rc, yaml] = await traverseAppDirectory(path, context, formData);
+        [appsembleContext, rc, yaml] = await traverseAppDirectory(appVariantPath, context, formData);
         filename = join(filename, 'app-definition.yaml');
     }
     const remote = (_a = appsembleContext.remote) !== null && _a !== void 0 ? _a : options.remote;
     const organizationId = (_b = appsembleContext.organization) !== null && _b !== void 0 ? _b : options.organization;
     const template = (_d = (_c = appsembleContext.template) !== null && _c !== void 0 ? _c : options.template) !== null && _d !== void 0 ? _d : false;
-    const demoMode = (_f = (_e = appsembleContext.demoMode) !== null && _e !== void 0 ? _e : options.demoMode) !== null && _f !== void 0 ? _f : false;
-    // TODO: seed depends on demoMode, this is caused by bad database normalization.
-    // Consider using a property called `type` on the App model instead.
-    const seed = (_j = (_h = (_g = appsembleContext.seed) !== null && _g !== void 0 ? _g : options.seed) !== null && _h !== void 0 ? _h : options.demoMode) !== null && _j !== void 0 ? _j : false;
-    const visibility = (_k = appsembleContext.visibility) !== null && _k !== void 0 ? _k : options.visibility;
-    const iconBackground = (_l = appsembleContext.iconBackground) !== null && _l !== void 0 ? _l : options.iconBackground;
-    const icon = (_m = options.icon) !== null && _m !== void 0 ? _m : appsembleContext.icon;
-    const maskableIcon = (_o = options.maskableIcon) !== null && _o !== void 0 ? _o : appsembleContext.maskableIcon;
-    const sentryDsn = (_p = appsembleContext.sentryDsn) !== null && _p !== void 0 ? _p : options.sentryDsn;
-    const sentryEnvironment = (_q = appsembleContext.sentryEnvironment) !== null && _q !== void 0 ? _q : options.sentryEnvironment;
-    const googleAnalyticsId = (_r = appsembleContext.googleAnalyticsId) !== null && _r !== void 0 ? _r : options.googleAnalyticsId;
+    const assetsClonable = (_f = (_e = appsembleContext.assetsClonable) !== null && _e !== void 0 ? _e : options.assetsClonable) !== null && _f !== void 0 ? _f : false;
+    const demoMode = (_h = (_g = appsembleContext.demoMode) !== null && _g !== void 0 ? _g : options.demoMode) !== null && _h !== void 0 ? _h : false;
+    const visibility = (_j = appsembleContext.visibility) !== null && _j !== void 0 ? _j : options.visibility;
+    const iconBackground = (_k = appsembleContext.iconBackground) !== null && _k !== void 0 ? _k : options.iconBackground;
+    const icon = (_l = options.icon) !== null && _l !== void 0 ? _l : appsembleContext.icon;
+    const maskableIcon = (_m = options.maskableIcon) !== null && _m !== void 0 ? _m : appsembleContext.maskableIcon;
+    const sentryDsn = (_o = appsembleContext.sentryDsn) !== null && _o !== void 0 ? _o : options.sentryDsn;
+    const sentryEnvironment = (_p = appsembleContext.sentryEnvironment) !== null && _p !== void 0 ? _p : options.sentryEnvironment;
+    const googleAnalyticsId = (_q = appsembleContext.googleAnalyticsId) !== null && _q !== void 0 ? _q : options.googleAnalyticsId;
     const appLock = appsembleContext.appLock || 'unlocked';
     logger.verbose(`App remote: ${remote}`);
     logger.verbose(`App organization: ${organizationId}`);
@@ -482,18 +589,17 @@ export async function publishApp({ assets, assetsClonable, clientCredentials, co
     formData.append('OrganizationId', organizationId);
     formData.append('template', String(template));
     formData.append('demoMode', String(demoMode));
-    formData.append('seed', String(seed));
     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 ${(_s = realIcon.path) !== null && _s !== void 0 ? _s : 'stdin'}`);
+        logger.info(`Using icon from ${(_r = realIcon.path) !== null && _r !== void 0 ? _r : 'stdin'}`);
         formData.append('icon', realIcon);
     }
     if (maskableIcon) {
         const realIcon = typeof maskableIcon === 'string' ? createReadStream(maskableIcon) : maskableIcon;
-        logger.info(`Using maskable icon from ${(_t = realIcon.path) !== null && _t !== void 0 ? _t : 'stdin'}`);
+        logger.info(`Using maskable icon from ${(_s = realIcon.path) !== null && _s !== void 0 ? _s : 'stdin'}`);
         formData.append('maskableIcon', realIcon);
     }
     if (sentryDsn) {
@@ -523,7 +629,7 @@ export async function publishApp({ assets, assetsClonable, clientCredentials, co
         if (!axios.isAxiosError(error)) {
             throw error;
         }
-        if (((_v = (_u = error.response) === null || _u === void 0 ? void 0 : _u.data) === null || _v === void 0 ? void 0 : _v.message) !== 'App validation failed') {
+        if (((_u = (_t = error.response) === null || _t === void 0 ? void 0 : _t.data) === null || _u === void 0 ? void 0 : _u.message) !== 'App validation failed') {
             throw error;
         }
         throw new AppsembleError(printAxiosError(filename, yaml, error.response.data.data.errors));
@@ -534,83 +640,47 @@ export async function publishApp({ assets, assetsClonable, clientCredentials, co
         return;
     }
     if (file.isDirectory() && !dryRun) {
-        // After uploading the app, upload block styles and messages if they are available
-        await traverseBlockThemes(path, data.id, remote, false);
-        await uploadMessages(path, data.id, remote, false);
-        if (assets && existsSync(join(path, 'assets'))) {
-            const assetsPath = join(path, 'assets');
-            const assetFiles = await readdir(assetsPath);
-            const normalizedPaths = assetFiles.map((assetFile) => normalizePath(join(assetsPath, assetFile)));
-            const files = await fg(normalizedPaths, { absolute: true, onlyFiles: true });
-            try {
-                logger.info(`Publishing ${files.length} asset(s)`);
-                for (const assetFilePath of files) {
-                    await publishAsset({
-                        name: parse(assetFilePath).name,
-                        appId: data.id,
-                        path: assetFilePath,
-                        remote,
-                        clonable: assetsClonable,
-                    });
-                }
-            }
-            catch (error) {
-                logger.error('Something went wrong when creating assets:');
-                logger.error(error);
-            }
+        // 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 && 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);
-                        resourcesToPublish.push({
-                            appId: data.id,
-                            path: join(resourcePath, resource.name),
-                            definition: appDefinition.resources[name],
-                            type: name,
-                        });
-                    }
-                    else if (resource.isDirectory()) {
-                        const subDirectoryResources = await readdir(join(resourcePath, resource.name), {
-                            withFileTypes: true,
-                        });
-                        for (const subResource of subDirectoryResources.filter((s) => s.isFile())) {
-                            resourcesToPublish.push({
-                                appId: data.id,
-                                path: join(resourcePath, resource.name, subResource.name),
-                                definition: appDefinition.resources[resource.name],
-                                type: resource.name,
-                            });
-                        }
-                    }
-                }
-                await publishResourcesRecursively({
-                    remote,
-                    resourcesToPublish,
-                    publishedResourcesIds,
-                });
-            }
-            catch (error) {
-                logger.error('Something went wrong when creating resources:');
-                logger.error(error);
-            }
+        if (resources) {
+            await publishSeedResources(appVariantPath, data, remote);
         }
     }
     if (modifyContext && appsembleContext && context && !dryRun) {
         rc.context[context].id = data.id;
-        await writeData(join(path, '.appsemblerc.yaml'), rc, { sort: false });
+        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(`App URL: ${protocol}//${data.path}.${data.OrganizationId}.${host}`);
     logger.info(`App store page: ${new URL(`/apps/${data.id}`, remote)}`);
+    const rcCollections = rc.context[context].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) {
+        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}`);
+    }
 }
 /**
  * Resolve the app’s ID and remote based on the app context.

package/lib/asset.d.ts

@@ -16,10 +16,14 @@ interface PublishAssetParams {
      * The remote server to publish the asset on.
      */
     remote: string;
+    /**
+     * Whether the published asset should be used as seed.
+     */
+    seed: boolean;
     /**
      * Whether the asset should be clonable.
      */
     clonable: boolean;
 }
-export declare function publishAsset({ appId, clonable, name, path, remote, }: PublishAssetParams): Promise<void>;
+export declare function publishAsset({ appId, clonable, name, path, remote, seed, }: PublishAssetParams): Promise<void>;
 export {};

package/lib/asset.js

@@ -3,7 +3,7 @@ import { logger } from '@appsemble/node-utils';
 import { normalize } from '@appsemble/utils';
 import axios from 'axios';
 import FormData from 'form-data';
-export async function publishAsset({ appId, clonable, name, path, remote, }) {
+export async function publishAsset({ appId, clonable, name, path, remote, seed, }) {
     const formData = new FormData();
     const file = createReadStream(path);
     formData.append('file', file);
@@ -11,7 +11,8 @@ export async function publishAsset({ appId, clonable, name, path, remote, }) {
     if (name) {
         formData.append('name', normalize(name));
     }
-    const { data: { id }, } = await axios.post(`/api/apps/${appId}/assets`, formData, { baseURL: remote });
+    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/resource.d.ts

@@ -34,6 +34,10 @@ interface PublishResourceParams {
      * The remote server to publish the resource on.
      */
     remote: string;
+    /**
+     * Whether the published resource should be used as seed.
+     */
+    seed: boolean;
     /**
      * The definition of the resource.
      */
@@ -54,6 +58,10 @@ interface PublishResourcesRecursivelyParams {
      * The remote server to publish the resource on.
      */
     remote: string;
+    /**
+     * Whether the published resources should be used as seed.
+     */
+    seed: boolean;
     /**
      * All resources that need to be published.
      */
@@ -63,7 +71,7 @@ interface PublishResourcesRecursivelyParams {
      */
     publishedResourcesIds: Record<string, number[]>;
 }
-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 publishResource({ appId, definition, path, publishedResourcesIds, remote, seed, type, }: PublishResourceParams): Promise<number[]>;
+export declare function publishResourcesRecursively({ publishedResourcesIds, remote, resourcesToPublish, seed, }: 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, definition, path, publishedResourcesIds = {}, remote, type, }) {
+export async function publishResource({ appId, definition, path, publishedResourcesIds = {}, remote, seed, type, }) {
     const csv = path.endsWith('.csv');
     let resources;
     if (csv) {
@@ -16,15 +16,16 @@ 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(`/api/apps/${appId}/resources/${type}`, resources, {
+        const response = await axios.post(endpoint, 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) => {
+        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 : {})) {
@@ -45,7 +46,7 @@ export async function publishResource({ appId, definition, path, publishedResour
         .join('\n')}`);
     return ids;
 }
-export async function publishResourcesRecursively({ publishedResourcesIds, remote, resourcesToPublish, }) {
+export async function publishResourcesRecursively({ publishedResourcesIds, remote, resourcesToPublish, seed, }) {
     let updatedPublishedResourcesIds = { ...publishedResourcesIds };
     for (const resourceToPublish of resourcesToPublish) {
         const resourceReferences = resourceToPublish.definition.references;
@@ -56,9 +57,10 @@ export async function publishResourcesRecursively({ publishedResourcesIds, remot
                 if (referencedResourcesToPublish.length &&
                     !updatedPublishedResourcesIds[referencedResourceType]) {
                     const referencedPublishedResourcesIds = await publishResourcesRecursively({
-                        remote,
                         resourcesToPublish: referencedResourcesToPublish,
                         publishedResourcesIds: updatedPublishedResourcesIds,
+                        remote,
+                        seed,
                     });
                     updatedPublishedResourcesIds = {
                         ...updatedPublishedResourcesIds,
@@ -72,6 +74,7 @@ export async function publishResourcesRecursively({ publishedResourcesIds, remot
                 ...resourceToPublish,
                 publishedResourcesIds: updatedPublishedResourcesIds,
                 remote,
+                seed,
             });
         }
     }

package/package.json

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

package/server/options/index.d.ts

@@ -33,4 +33,3 @@ export * from './applyAppServiceSecrets.js';
 export * from './getAppMembers.js';
 export * from './getAppTeams.js';
 export * from './getAppUserInfo.js';
-export * from './checkSeededResources.js';

package/server/options/index.js

@@ -33,5 +33,4 @@ export * from './applyAppServiceSecrets.js';
 export * from './getAppMembers.js';
 export * from './getAppTeams.js';
 export * from './getAppUserInfo.js';
-export * from './checkSeededResources.js';
 //# sourceMappingURL=index.js.map

package/server/options/options.js

@@ -1,8 +1,7 @@
-import { applyAppServiceSecrets, checkRole, checkSeededResources, createAppAsset, createAppResourcesWithAssets, createSettings, createTheme, deleteAppAsset, deleteAppResource, email, getApp, getAppAssets, getAppBlockStyles, getAppDetails, getAppIcon, getAppMembers, getAppMessages, getAppResource, getAppResources, getAppScreenshots, getAppStyles, getAppTeams, getAppUrl, getAppUserInfo, getBlockAsset, getBlockMessages, getBlocksAssetsPaths, getCsp, getDbUpdated, getHost, getTheme, parseQuery, reloadUser, sendNotifications, updateAppResource, verifyResourceActionPermission, } from './index.js';
+import { applyAppServiceSecrets, checkRole, createAppAsset, createAppResourcesWithAssets, createSettings, createTheme, deleteAppAsset, deleteAppResource, email, getApp, getAppAssets, getAppBlockStyles, getAppDetails, getAppIcon, getAppMembers, getAppMessages, getAppResource, getAppResources, getAppScreenshots, getAppStyles, getAppTeams, getAppUrl, getAppUserInfo, getBlockAsset, getBlockMessages, getBlocksAssetsPaths, getCsp, getDbUpdated, getHost, getTheme, parseQuery, reloadUser, sendNotifications, updateAppResource, verifyResourceActionPermission, } from './index.js';
 export const options = {
     applyAppServiceSecrets,
     checkRole,
-    checkSeededResources,
     createAppAsset,
     createAppResourcesWithAssets,
     createSettings,

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

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

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

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

package/templates/blocks/preact/package.json

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

package/templates/blocks/vanilla/package.json

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

package/server/options/checkSeededResources.d.ts

@@ -1 +0,0 @@
-export declare function checkSeededResources(): Promise<boolean>;

package/server/options/checkSeededResources.js

@@ -1,4 +0,0 @@
-export function checkSeededResources() {
-    return Promise.resolve(false);
-}
-//# sourceMappingURL=checkSeededResources.js.map