@appsemble/cli 0.23.9 → 0.24.1

package/README.md

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

package/commands/asset/publish.d.ts

@@ -7,9 +7,10 @@ interface PublishAssetArguments extends BaseArguments {
     appId: number;
     context: string;
     app: string;
+    clonable: 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, context, name, paths, remote, useFileName, }: PublishAssetArguments): Promise<void>;
+export declare function handler({ app, appId, clientCredentials, clonable, context, name, paths, remote, useFileName, }: PublishAssetArguments): Promise<void>;
 export {};

package/commands/asset/publish.js

@@ -30,9 +30,14 @@ export function builder(yargs) {
     })
         .option('context', {
         describe: 'If specified, use the specified context from .appsemblerc.yaml',
+    })
+        .option('clonable', {
+        type: 'boolean',
+        default: false,
+        describe: 'If true, all published assets will be clonable',
     });
 }
-export async function handler({ app, appId, clientCredentials, context, name, paths, remote, useFileName, }) {
+export async function handler({ app, appId, clientCredentials, clonable, context, name, paths, remote, useFileName, }) {
     const [resolvedAppId, resolvedRemote] = await resolveAppIdAndRemote(app, context, remote, appId);
     await authenticate(resolvedRemote, 'assets:write', clientCredentials);
     const normalizedPaths = paths.map((path) => normalizePath(path));
@@ -48,6 +53,7 @@ export async function handler({ app, appId, clientCredentials, context, name, pa
             appId: resolvedAppId,
             path,
             remote: resolvedRemote,
+            clonable,
         });
     }
 }

package/commands/{cleanupResources.d.ts → cleanupResourcesAndAssets.d.ts}

@@ -1,6 +1,6 @@
 import { type Argv } from 'yargs';
 import { type BaseArguments } from '../types.js';
-export declare const command = "cleanup-resources";
-export declare const description = "Deletes all expired resources from the database.";
+export declare const command = "cleanup-resources-and-assets";
+export declare const description = "Deletes all expired or ephemeral resources and assets from the database and reseeds demo apps.";
 export declare function builder(yargs: Argv): Argv<any>;
 export declare function handler(argv: BaseArguments): Promise<void>;

package/commands/{cleanupResources.js → cleanupResourcesAndAssets.js}

@@ -1,6 +1,6 @@
 import { serverImport } from '../lib/serverImport.js';
-export const command = 'cleanup-resources';
-export const description = 'Deletes all expired resources from the database.';
+export const command = 'cleanup-resources-and-assets';
+export const description = 'Deletes all expired or ephemeral resources and assets from the database and reseeds demo apps.';
 export function builder(yargs) {
     return yargs
         .option('database-host', {
@@ -33,8 +33,8 @@ export function builder(yargs) {
     });
 }
 export async function handler(argv) {
-    const { cleanupResources, setArgv } = await serverImport('setArgv', 'cleanupResources');
+    const { cleanupResourcesAndAssets, setArgv } = await serverImport('setArgv', 'cleanupResourcesAndAssets');
     setArgv(argv);
-    return cleanupResources();
+    return cleanupResourcesAndAssets();
 }
-//# sourceMappingURL=cleanupResources.js.map
+//# sourceMappingURL=cleanupResourcesAndAssets.js.map

package/commands/serve.js

@@ -71,6 +71,8 @@ export async function handler(argv) {
             name: 'dev',
             primaryEmail: 'dev@example.com',
             role: passedUserRole || (appSecurity === null || appSecurity === void 0 ? void 0 : appSecurity.default.role),
+            demo: false,
+            properties: {},
         },
     ];
     const allowedTeamRoles = ['manager', 'member'];

package/index.js

@@ -7,8 +7,7 @@ import * as app from './commands/app/index.js';
 import * as asset from './commands/asset/index.js';
 import * as block from './commands/block/index.js';
 import * as cleanupDemoUsers from './commands/cleanupDemoUsers.js';
-import * as cleanupResources from './commands/cleanupResources.js';
-import * as cleanupTemplateResources from './commands/cleanupTemplateResources.js';
+import * as cleanupResourcesAndAssets from './commands/cleanupResourcesAndAssets.js';
 import * as config from './commands/config/index.js';
 import * as login from './commands/login.js';
 import * as logout from './commands/logout.js';
@@ -48,9 +47,8 @@ let parser = yargs(process.argv.slice(2))
     .command(app)
     .command(asset)
     .command(block)
-    .command(cleanupResources)
+    .command(cleanupResourcesAndAssets)
     .command(cleanupDemoUsers)
-    .command(cleanupTemplateResources)
     .command(config)
     .command(login)
     .command(logout)

package/lib/app.js

@@ -546,7 +546,7 @@ export async function publishApp({ clientCredentials, context, dryRun, modifyCon
     }
     if (modifyContext && appsembleContext && context && !dryRun) {
         rc.context[context].id = data.id;
-        await writeData(join(path, '.appsemblerc.yaml'), rc);
+        await writeData(join(path, '.appsemblerc.yaml'), rc, { sort: false });
         logger.info(`Updated .appsemblerc: Set context.${context}.id to ${data.id}`);
     }
     const { host, protocol } = new URL(remote);

package/lib/asset.d.ts

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

package/lib/asset.js

@@ -3,10 +3,11 @@ 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, name, path, remote, }) {
+export async function publishAsset({ appId, clonable, name, path, remote, }) {
     const formData = new FormData();
     const file = createReadStream(path);
     formData.append('file', file);
+    formData.append('clonable', String(clonable));
     if (name) {
         formData.append('name', normalize(name));
     }

package/lib/serverImport.d.ts

@@ -4,4 +4,4 @@
  * @param members The names of the exported member to import.
  * @returns The exported member.
  */
-export declare function serverImport<T extends 'cleanupDemoUsers' | 'cleanupResources' | 'cleanupTemplateResources' | 'migrate' | 'runCronJobs' | 'setArgv' | 'start'>(...members: T[]): Promise<Record<T, any>>;
+export declare function serverImport<T extends 'cleanupDemoUsers' | 'cleanupResourcesAndAssets' | 'migrate' | 'runCronJobs' | 'setArgv' | 'start'>(...members: T[]): Promise<Record<T, any>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/cli",
-  "version": "0.23.9",
+  "version": "0.24.1",
   "description": "The CLI for developing with Appsemble apps and blocks",
   "keywords": [
     "app",
@@ -42,9 +42,9 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/node-utils": "0.23.9",
-    "@appsemble/types": "0.23.9",
-    "@appsemble/utils": "0.23.9",
+    "@appsemble/node-utils": "0.24.1",
+    "@appsemble/types": "0.24.1",
+    "@appsemble/utils": "0.24.1",
     "@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.23.9",
+    "@appsemble/types": "0.24.1",
     "@types/concat-stream": "^2.0.0",
     "@types/inquirer": "^9.0.0",
     "@types/normalize-path": "^3.0.0",

package/server/models/Resource.d.ts

@@ -2,6 +2,8 @@ import { type FindOptions } from '@appsemble/node-utils';
 export declare class Resource {
     id: number;
     $clonable: boolean;
+    $seed: boolean;
+    $ephemeral: boolean;
     $created: string;
     $updated: string;
     [key: string]: unknown;

package/server/options/checkSeededResources.d.ts

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

package/server/options/checkSeededResources.js

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

package/server/options/index.d.ts

@@ -33,3 +33,4 @@ 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,4 +33,5 @@ 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,7 +1,8 @@
-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';
+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';
 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.23.9
+        version: 0.24.1
         parameters:
           icon: arrow-right
         actions:
@@ -17,7 +17,7 @@ pages:
   - name: Example Page B
     blocks:
       - type: action-button
-        version: 0.23.9
+        version: 0.24.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.23.9",
+    "@appsemble/sdk": "0.24.1",
     "mini-jsx": "^4.0.0"
   }
 }

package/templates/blocks/preact/package.json

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

package/templates/blocks/vanilla/package.json

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

package/commands/cleanupTemplateResources.d.ts

@@ -1,6 +0,0 @@
-import { type Argv } from 'yargs';
-import { type BaseArguments } from '../types.js';
-export declare const command = "cleanup-template-resources";
-export declare const description = "Deletes all non-clonable resources belonging to template apps from the database.";
-export declare function builder(yargs: Argv): Argv<any>;
-export declare function handler(argv: BaseArguments): Promise<void>;

package/commands/cleanupTemplateResources.js

@@ -1,40 +0,0 @@
-import { serverImport } from '../lib/serverImport.js';
-export const command = 'cleanup-template-resources';
-export const description = 'Deletes all non-clonable resources belonging to template apps from the database.';
-export function builder(yargs) {
-    return yargs
-        .option('database-host', {
-        desc: 'The host of the database to connect to. This defaults to the connected database container.',
-    })
-        .option('database-port', {
-        desc: 'The port of the database to connect to.',
-        type: 'number',
-        default: 5432,
-    })
-        .option('database-ssl', {
-        desc: 'Use SSL to connect to the database.',
-        type: 'boolean',
-    })
-        .option('database-name', {
-        desc: 'The name of the database to connect to.',
-        implies: ['database-user', 'database-password'],
-    })
-        .option('database-user', {
-        desc: 'The user to use to login to the database.',
-        implies: ['database-name', 'database-password'],
-    })
-        .option('database-password', {
-        desc: 'The password to use to login to the database.',
-        implies: ['database-name', 'database-user'],
-    })
-        .option('database-url', {
-        desc: 'A connection string for the database to connect to. This is an alternative to the separate database related variables.',
-        conflicts: ['database-host', 'database-name', 'database-user', 'database-password'],
-    });
-}
-export async function handler(argv) {
-    const { cleanupTemplateResources, setArgv } = await serverImport('setArgv', 'cleanupTemplateResources');
-    setArgv(argv);
-    return cleanupTemplateResources();
-}
-//# sourceMappingURL=cleanupTemplateResources.js.map