@appsemble/cli 0.33.11 → 0.34.1-test.1

package/README.md

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

package/commands/app/publish.d.ts

@@ -21,6 +21,11 @@ interface PublishAppArguments extends BaseArguments {
     sentryDsn: string;
     sentryEnvironment: string;
     googleAnalyticsId: string;
+    dbName: string;
+    dbHost: string;
+    dbPort: number;
+    dbUser: string;
+    dbPassword: string;
 }
 export declare const command = "publish <paths...>";
 export declare const description = "Publish a new App to a remote based on a specified YAML file or directory.";

package/commands/app/publish.js

@@ -76,6 +76,22 @@ export function builder(yargs) {
         .option('sentry-environment', {
         describe: 'The environment for the custom Sentry DSN for the app.',
         implies: ['sentry-dsn'],
+    })
+        .option('db-name', {
+        describe: 'The name of the external app database.',
+    })
+        .option('db-host', {
+        describe: 'The host of the external app database.',
+    })
+        .option('db-port', {
+        describe: 'The port of the external app database.',
+        type: 'number',
+    })
+        .option('db-user', {
+        describe: 'The user of the external app database.',
+    })
+        .option('db-password', {
+        describe: 'The password of the external app database.',
     });
 }
 export async function handler({ paths, ...args }) {

package/commands/app/update.d.ts

@@ -19,6 +19,11 @@ interface UpdateAppArguments extends BaseArguments {
     sentryDsn: string;
     sentryEnvironment: string;
     googleAnalyticsId: string;
+    dbName: string;
+    dbHost: string;
+    dbPort: number;
+    dbUser: string;
+    dbPassword: string;
 }
 export declare const command = "update <paths...>";
 export declare const description = "Update an app based on a specified YAML file or directory.";

package/commands/app/update.js

@@ -76,6 +76,22 @@ export function builder(yargs) {
         .option('sentry-environment', {
         describe: 'The environment for the custom Sentry DSN for the app.',
         implies: ['sentry-dsn'],
+    })
+        .option('db-name', {
+        describe: 'The name of the external app database.',
+    })
+        .option('db-host', {
+        describe: 'The host of the external app database.',
+    })
+        .option('db-port', {
+        describe: 'The port of the external app database.',
+        type: 'number',
+    })
+        .option('db-user', {
+        describe: 'The user of the external app database.',
+    })
+        .option('db-password', {
+        describe: 'The password of the external app database.',
     });
 }
 export async function handler({ clientCredentials, id, paths, remote, ...args }) {

package/commands/migrate.js

@@ -14,7 +14,6 @@ export function builder(yargs) {
         .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.',

package/index.js

@@ -7,7 +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 checkDownMigrations from './commands/checkDownMigrations.js';
-import * as checkMigrations from './commands/checkMigrations.js';
+import * as checkAppMigrations from './commands/checkMigrations.js';
 import * as cleanupDemoAppMembers from './commands/cleanupDemoAppMembers.js';
 import * as cleanupResourcesAndAssets from './commands/cleanupResourcesAndAssets.js';
 import * as cleanupSoftDeletedRecords from './commands/cleanupSoftDeletedRecords.js';
@@ -58,7 +58,7 @@ let parser = yargs(process.argv.slice(2))
     .command(cleanupResourcesAndAssets)
     .command(cleanupDemoAppMembers)
     .command(cleanupSoftDeletedRecords)
-    .command(checkMigrations)
+    .command(checkAppMigrations)
     .command(checkDownMigrations)
     .command(fuzzMigrations)
     .command(config)

package/lib/app.d.ts

@@ -140,6 +140,26 @@ interface PublishAppParams {
      * The environment for the custom Sentry DSN for the app.
      */
     sentryEnvironment?: string;
+    /**
+     * The name of the external app database.
+     */
+    dbName?: string;
+    /**
+     * The host of the external app database.
+     */
+    dbHost?: string;
+    /**
+     * The port of the external app database.
+     */
+    dbPort?: number;
+    /**
+     * The user of the external app database.
+     */
+    dbUser?: string;
+    /**
+     * The password of the external app database.
+     */
+    dbPassword?: string;
 }
 /**
  * Publish a new app.
@@ -224,6 +244,26 @@ interface UpdateAppParams {
      * The environment for the custom Sentry DSN for the app.
      */
     sentryEnvironment?: string;
+    /**
+     * The name of the external app database.
+     */
+    dbName?: string;
+    /**
+     * The host of the external app database.
+     */
+    dbHost?: string;
+    /**
+     * The port of the external app database.
+     */
+    dbPort?: number;
+    /**
+     * The user of the external app database.
+     */
+    dbUser?: string;
+    /**
+     * The password of the external app database.
+     */
+    dbPassword?: string;
 }
 /**
  * Update an existing app.

package/lib/app.js

@@ -783,6 +783,11 @@ export async function publishApp({ clientCredentials, context, dryRun, modifyCon
     const assets = appsembleContext.assets ?? options.assets;
     const resources = appsembleContext.resources ?? options.resources;
     const appLock = appsembleContext.appLock || 'unlocked';
+    const dbName = appsembleContext.dbName ?? options.dbName;
+    const dbHost = appsembleContext.dbHost ?? options.dbHost;
+    const dbPort = appsembleContext.dbPort ?? options.dbPort;
+    const dbUser = appsembleContext.dbUser ?? options.dbUser;
+    const { dbPassword } = options;
     logger.verbose(`App remote: ${remote}`);
     logger.verbose(`App organization: ${organizationId}`);
     logger.verbose(`App is template: ${inspect(template, { colors: true })}`);
@@ -797,6 +802,21 @@ export async function publishApp({ clientCredentials, context, dryRun, modifyCon
     formData.append('visibility', visibility);
     formData.append('iconBackground', iconBackground);
     formData.append('locked', appLock);
+    if (dbName) {
+        formData.append('dbName', dbName);
+    }
+    if (dbHost) {
+        formData.append('dbHost', dbHost);
+    }
+    if (dbPort) {
+        formData.append('dbPort', dbPort);
+    }
+    if (dbUser) {
+        formData.append('dbUser', dbUser);
+    }
+    if (dbPassword) {
+        formData.append('dbPassword', dbPassword);
+    }
     if (icon) {
         const realIcon = typeof icon === 'string' ? createReadStream(icon) : icon;
         logger.info(`Using icon from ${realIcon.path ?? 'stdin'}`);
@@ -957,6 +977,11 @@ export async function updateApp({ clientCredentials, context, force, path, ...op
     const resources = appsembleContext.resources ?? options.resources;
     const assets = appsembleContext.assets ?? options.assets;
     const { appLock } = appsembleContext;
+    const dbName = appsembleContext.dbName ?? options.dbName;
+    const dbHost = appsembleContext.dbHost ?? options.dbHost;
+    const dbPort = appsembleContext.dbPort ?? options.dbPort;
+    const dbUser = appsembleContext.dbUser ?? options.dbUser;
+    const { dbPassword } = options;
     logger.info(`App id: ${id}`);
     logger.verbose(`App remote: ${remote}`);
     logger.verbose(`App is template: ${inspect(template, { colors: true })}`);
@@ -971,6 +996,21 @@ export async function updateApp({ clientCredentials, context, force, path, ...op
     formData.append('demoMode', String(demoMode));
     formData.append('visibility', visibility);
     formData.append('iconBackground', iconBackground);
+    if (dbName) {
+        formData.append('dbName', dbName);
+    }
+    if (dbHost) {
+        formData.append('dbHost', dbHost);
+    }
+    if (dbPort) {
+        formData.append('dbPort', dbPort);
+    }
+    if (dbUser) {
+        formData.append('dbUser', dbUser);
+    }
+    if (dbPassword) {
+        formData.append('dbPassword', dbPassword);
+    }
     if (icon) {
         const realIcon = typeof icon === 'string' ? createReadStream(icon) : icon;
         logger.info(`Using icon from ${realIcon.path ?? 'stdin'}`);

package/lib/group.d.ts

@@ -59,9 +59,9 @@ interface CreateGroupParams extends SharedGroupParams {
 }
 export declare function resolveAnnotations(annotations: string[]): Record<string, string> | undefined;
 export declare function createGroup({ annotations, appId, clientCredentials, name, remote, }: CreateGroupParams): Promise<void>;
-export declare function deleteGroup({ clientCredentials, id, remote, }: SharedExistingGroupParams): Promise<void>;
-export declare function updateGroup({ annotations, id, name, remote, }: UpdateGroupParams): Promise<void>;
-export declare function inviteMember({ id, remote, role, user, }: InviteGroupMemberParams): Promise<void>;
-export declare function updateMember({ id, remote, role, user, }: UpdateGroupMemberParams): Promise<void>;
-export declare function deleteMember({ id, user }: SharedGroupMemberParams): Promise<void>;
+export declare function deleteGroup({ appId, clientCredentials, id, remote, }: SharedExistingGroupParams): Promise<void>;
+export declare function updateGroup({ annotations, appId, id, name, remote, }: UpdateGroupParams): Promise<void>;
+export declare function inviteMember({ appId, id, remote, role, user, }: InviteGroupMemberParams): Promise<void>;
+export declare function updateMember({ appId, id, remote, role, user, }: UpdateGroupMemberParams): Promise<void>;
+export declare function deleteMember({ appId, id, user }: SharedGroupMemberParams): Promise<void>;
 export {};

package/lib/group.js

@@ -22,35 +22,35 @@ export async function createGroup({ annotations = [], appId, clientCredentials,
     }, { baseURL: remote });
     logger.info(`Successfully created group ${name} with ID ${id}`);
 }
-export async function deleteGroup({ clientCredentials, id, remote, }) {
+export async function deleteGroup({ appId, clientCredentials, id, remote, }) {
     await authenticate(remote, 'groups:write', clientCredentials);
     logger.info(`Deleting group ${id}`);
-    await axios.delete(`/api/groups/${id}`, { baseURL: remote });
+    await axios.delete(`/api/apps/${appId}/groups/${id}`, { baseURL: remote });
     logger.info(`Successfully deleted group ${id}`);
 }
-export async function updateGroup({ annotations = [], id, name, remote, }) {
+export async function updateGroup({ annotations = [], appId, id, name, remote, }) {
     logger.info(`Updating group ${id}`);
-    await axios.patch(`/api/groups/${id}`, {
+    await axios.patch(`/api/apps/${appId}/groups/${id}`, {
         name,
         annotations: resolveAnnotations(annotations),
     }, { baseURL: remote });
     logger.info(`Successfully updated group ${id}`);
 }
-export async function inviteMember({ id, remote, role, user, }) {
+export async function inviteMember({ appId, id, remote, role, user, }) {
     logger.info(`Inviting ${user} to group ${id}`);
-    await axios.post(`/api/groups/${id}/invites`, [{ email: user, role }], {
+    await axios.post(`/api/apps/${appId}/groups/${id}/invites`, [{ email: user, role }], {
         baseURL: remote,
     });
     logger.info(`Successfully invited ${user} to group ${id}`);
 }
-export async function updateMember({ id, remote, role, user, }) {
+export async function updateMember({ appId, id, remote, role, user, }) {
     logger.info(`Updating ${user}’s role in group ${id} to ${role}`);
-    await axios.put(`/api/group-members/${user}/role`, { role }, { baseURL: remote });
+    await axios.put(`/api/apps/${appId}/group-members/${user}/role`, { role }, { baseURL: remote });
     logger.info(`Successfully updated ${user} in group ${id}`);
 }
-export async function deleteMember({ id, user }) {
+export async function deleteMember({ appId, id, user }) {
     logger.info(`Deleting ${user} to group ${id}`);
-    await axios.delete(`/api/group-members/${user}?selectedGroupId=${id}`);
+    await axios.delete(`/api/apps/${appId}/group-members/${user}?selectedGroupId=${id}`);
     logger.info(`Successfully deleted ${user} from group ${id}`);
 }
 //# sourceMappingURL=group.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/cli",
-  "version": "0.33.11",
+  "version": "0.34.1-test.1",
   "description": "The CLI for developing with Appsemble apps and blocks",
   "keywords": [
     "app",
@@ -44,10 +44,10 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/node-utils": "0.33.11",
-    "@appsemble/types": "0.33.11",
-    "@appsemble/lang-sdk": "0.33.11",
-    "@appsemble/utils": "0.33.11",
+    "@appsemble/node-utils": "0.34.1-test.1",
+    "@appsemble/types": "0.34.1-test.1",
+    "@appsemble/lang-sdk": "0.34.1-test.1",
+    "@appsemble/utils": "0.34.1-test.1",
     "@fortawesome/fontawesome-common-types": "^6.0.0",
     "@koa/cors": "^5.0.0",
     "@odata/parser": "^0.2.0",
@@ -90,8 +90,8 @@
     "yargs": "^17.0.0"
   },
   "devDependencies": {
-    "@appsemble/types": "0.33.11",
-    "@appsemble/server": "0.33.11",
+    "@appsemble/types": "0.34.1-test.1",
+    "@appsemble/server": "0.34.1-test.1",
     "bcrypt": "5.1.1",
     "axios-test-instance": "7.0.0",
     "@types/concat-stream": "2.0.3",

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

@@ -6,7 +6,7 @@ pages:
   - name: Example Page A
     blocks:
       - type: action-button
-        version: 0.33.11
+        version: 0.34.1-test.1
         parameters:
           icon: arrow-right
         actions:
@@ -17,7 +17,7 @@ pages:
   - name: Example Page B
     blocks:
       - type: action-button
-        version: 0.33.11
+        version: 0.34.1-test.1
         parameters:
           icon: arrow-left
         actions:

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

@@ -5,7 +5,7 @@
     "*.css"
   ],
   "dependencies": {
-    "@appsemble/sdk": "0.33.11",
+    "@appsemble/sdk": "0.34.1-test.1",
     "mini-jsx": "^4.0.0"
   }
 }

package/templates/blocks/preact/package.json

@@ -5,8 +5,8 @@
     "*.css"
   ],
   "dependencies": {
-    "@appsemble/preact": "0.33.11",
-    "@appsemble/sdk": "0.33.11",
+    "@appsemble/preact": "0.34.1-test.1",
+    "@appsemble/sdk": "0.34.1-test.1",
     "preact": "^10.0.0"
   }
 }

package/templates/blocks/vanilla/package.json

@@ -5,6 +5,6 @@
     "*.css"
   ],
   "dependencies": {
-    "@appsemble/sdk": "0.33.11"
+    "@appsemble/sdk": "0.34.1-test.1"
   }
 }

package/vitest.setup.js

@@ -1,8 +1,8 @@
 import { randomUUID } from 'node:crypto';
 import { clearAllS3Buckets, CREDENTIALS_ENV_VAR, initS3Client, setFixtureBase, setLogLevel, } from '@appsemble/node-utils';
-import { rootDB, setupTestDatabase } from '@appsemble/server';
+import { getRootDB, models, setupTestDatabase } from '@appsemble/server';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { afterAll, beforeAll, beforeEach, vi } from 'vitest';
+import { afterAll, afterEach, beforeAll, beforeEach, vi } from 'vitest';
 setFixtureBase(import.meta);
 delete process.env[CREDENTIALS_ENV_VAR];
 setLogLevel(0);
@@ -19,14 +19,18 @@ beforeAll(async () => {
     });
 });
 beforeEach(async () => {
+    await models.dropAndCloseAllAppDBs();
     await testDB.truncate({ truncate: true, cascade: true, force: true, restartIdentity: true });
     vi.useRealTimers();
     await clearAllS3Buckets();
 });
+afterEach(async () => {
+    await models.dropAndCloseAllAppDBs();
+});
 afterAll(() => {
     testDB.close();
     // We need to drop the test database from the root database
     // testDB.drop() doesn't actually delete the database
-    rootDB.query(`DROP DATABASE ${testDB.getDatabaseName()}`);
+    getRootDB().query(`DROP DATABASE ${testDB.getDatabaseName()}`);
 });
 //# sourceMappingURL=vitest.setup.js.map