@appsemble/cli 0.38.2-test.0 → 0.39.1

package/README.md

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

package/commands/organization/index.js

@@ -1,4 +1,5 @@
 import * as create from './create.js';
+import * as member from './member/index.js';
 import * as update from './update.js';
 import * as upsert from './upsert.js';
 export { noop as handler } from '@appsemble/utils';
@@ -7,6 +8,7 @@ export const description = 'Commands related to organizations.';
 export function builder(yargs) {
     return yargs
         .command(create)
+        .command(member)
         .command(update)
         .command(upsert)
         .demandCommand(1);

package/commands/organization/member/add.d.ts

@@ -0,0 +1,12 @@
+import { type Argv } from 'yargs';
+import { type BaseArguments } from '../../../types.js';
+interface AddOrganizationMemberArguments extends BaseArguments {
+    email: string;
+    id: string;
+    role: string;
+}
+export declare const command = "add <email>";
+export declare const description = "Add an existing Appsemble account to an organization.";
+export declare function builder(yargs: Argv): Argv<any>;
+export declare function handler({ clientCredentials, email, id, remote, role, }: AddOrganizationMemberArguments): Promise<void>;
+export {};

package/commands/organization/member/add.js

@@ -0,0 +1,25 @@
+import { authenticate } from '@appsemble/node-utils';
+import { PredefinedOrganizationRole, predefinedOrganizationRoles } from '@appsemble/types';
+import { addOrganizationMember } from '../../../lib/organization.js';
+export const command = 'add <email>';
+export const description = 'Add an existing Appsemble account to an organization.';
+export function builder(yargs) {
+    return yargs
+        .positional('email', {
+        describe: 'The email address of the account to add',
+    })
+        .option('id', {
+        describe: 'The id of the organization to add the account to',
+        demandOption: true,
+    })
+        .option('role', {
+        describe: 'The organization role to assign to the new member',
+        choices: predefinedOrganizationRoles,
+        default: PredefinedOrganizationRole.Member,
+    });
+}
+export async function handler({ clientCredentials, email, id, remote, role, }) {
+    await authenticate(remote, 'organizations:write', clientCredentials);
+    await addOrganizationMember({ email, id, role });
+}
+//# sourceMappingURL=add.js.map

package/commands/organization/member/index.d.ts

@@ -0,0 +1,5 @@
+import { type Argv } from 'yargs';
+export { noop as handler } from '@appsemble/utils';
+export declare const command = "member";
+export declare const description = "Commands related to organization members.";
+export declare function builder(yargs: Argv): Argv;

package/commands/organization/member/index.js

@@ -0,0 +1,8 @@
+import * as add from './add.js';
+export { noop as handler } from '@appsemble/utils';
+export const command = 'member';
+export const description = 'Commands related to organization members.';
+export function builder(yargs) {
+    return yargs.command(add).demandCommand(1);
+}
+//# sourceMappingURL=index.js.map

package/lib/app.js

@@ -4,7 +4,7 @@ import { basename, dirname, join, parse, relative, resolve } from 'node:path';
 import { inspect } from 'node:util';
 import { normalizeBlockName } from '@appsemble/lang-sdk';
 import { applyAppVariant, AppsembleError, authenticate, logger, opendirSafe, preProcessCSV, readData, writeData, } from '@appsemble/node-utils';
-import { extractAppMessages, has } from '@appsemble/utils';
+import { extractAppMessages, has, normalizeLocale } from '@appsemble/utils';
 import axios from 'axios';
 import csv from 'csvtojson';
 import fg from 'fast-glob';
@@ -234,7 +234,9 @@ export async function uploadMessages(path, appId, remote, force) {
     logger.info('Searching for translations 🕵');
     await opendirSafe(join(path, 'i18n'), async (messageFile) => {
         logger.verbose(`Processing ${messageFile} ⚙️`);
-        const { name: language } = parse(messageFile);
+        // Weblate names its catalogs with a POSIX locale, such as `zh_Hans.json`. The API takes a
+        // BCP 47 language tag.
+        const language = normalizeLocale(parse(messageFile).name);
         if (result.some((entry) => entry.language === language)) {
             throw new AppsembleError(`Found duplicate language “${language}”. Make sure each language only exists once in the directory.`);
         }

package/lib/organization.d.ts

@@ -18,4 +18,19 @@ interface OrganizationArguments {
 export declare function createOrganization({ city, countryCode, description, email, houseNumber, icon, id, invoiceReference, locale, name, streetName, vatIdNumber, website, zipCode, }: OrganizationArguments): Promise<void>;
 export declare function updateOrganization({ city, countryCode, description, email, houseNumber, icon, id, invoiceReference, locale, name, streetName, vatIdNumber, website, zipCode, }: OrganizationArguments): Promise<void>;
 export declare function upsertOrganization({ city, countryCode, description, email, houseNumber, icon, id, invoiceReference, locale, name, streetName, vatIdNumber, website, zipCode, }: OrganizationArguments): Promise<void>;
+interface AddOrganizationMemberArguments {
+    /**
+     * The id of the organization to add the member to.
+     */
+    id: string;
+    /**
+     * The email address of the account to add.
+     */
+    email: string;
+    /**
+     * The organization role to assign to the new member.
+     */
+    role: string;
+}
+export declare function addOrganizationMember({ email, id, role, }: AddOrganizationMemberArguments): Promise<void>;
 export {};

package/lib/organization.js

@@ -175,4 +175,15 @@ export async function upsertOrganization({ city, countryCode, description, email
         }
     }
 }
+export async function addOrganizationMember({ email, id, role, }) {
+    logger.info(`Adding ${email} to organization ${id} as ${role}`);
+    try {
+        await axios.post(`/api/organizations/${id}/members`, { email, role });
+        logger.info(`Successfully added ${email} to organization ${id}`);
+    }
+    catch (error) {
+        logger.error(error);
+        throw error;
+    }
+}
 //# sourceMappingURL=organization.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/cli",
-  "version": "0.38.2-test.0",
+  "version": "0.39.1",
   "description": "The CLI for developing with Appsemble apps and blocks",
   "keywords": [
     "app",
@@ -44,10 +44,10 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/node-utils": "0.38.2-test.0",
-    "@appsemble/types": "0.38.2-test.0",
-    "@appsemble/lang-sdk": "0.38.2-test.0",
-    "@appsemble/utils": "0.38.2-test.0",
+    "@appsemble/node-utils": "0.39.1",
+    "@appsemble/types": "0.39.1",
+    "@appsemble/lang-sdk": "0.39.1",
+    "@appsemble/utils": "0.39.1",
     "@fortawesome/fontawesome-common-types": "^6.0.0",
     "@inquirer/prompts": "^8.0.0",
     "@koa/cors": "^5.0.0",
@@ -90,8 +90,8 @@
     "yargs": "^17.0.0"
   },
   "devDependencies": {
-    "@appsemble/types": "0.38.2-test.0",
-    "@appsemble/server": "0.38.2-test.0",
+    "@appsemble/types": "0.39.1",
+    "@appsemble/server": "0.39.1",
     "@types/concat-stream": "2.0.3",
     "@types/koa__cors": "5.0.1",
     "@types/koa-compress": "4.0.7",

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

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

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

@@ -5,7 +5,7 @@
     "*.css"
   ],
   "dependencies": {
-    "@appsemble/sdk": "0.38.2-test.0",
+    "@appsemble/sdk": "0.39.1",
     "mini-jsx": "^4.0.0"
   }
 }

package/templates/blocks/preact/package.json

@@ -5,8 +5,8 @@
     "*.css"
   ],
   "dependencies": {
-    "@appsemble/preact": "0.38.2-test.0",
-    "@appsemble/sdk": "0.38.2-test.0",
+    "@appsemble/preact": "0.39.1",
+    "@appsemble/sdk": "0.39.1",
     "preact": "^10.0.0"
   }
 }

package/templates/blocks/vanilla/package.json

@@ -5,6 +5,6 @@
     "*.css"
   ],
   "dependencies": {
-    "@appsemble/sdk": "0.38.2-test.0"
+    "@appsemble/sdk": "0.39.1"
   }
 }

package/vitest.setup.js

@@ -16,6 +16,7 @@ beforeAll(async () => {
         endPoint: process.env.S3_HOST || 'localhost',
         port: Number(process.env.S3_PORT) || 9009,
         useSSL: false,
+        bucket: process.env.S3_BUCKET,
     });
 });
 beforeEach(async () => {