@appsemble/cli 0.36.10-test.2 → 0.36.10-test.4

package/README.md

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

package/commands/serve.js

@@ -66,16 +66,19 @@ export async function handler(argv) {
             : new AppsembleError('This app does not support roles');
     }
     const appSecurity = appsembleApp.definition.security;
+    const appMemberRole = passedUserRole || appSecurity?.default?.role;
     const appMemberInfo = {
         sub: '1',
         name: 'dev',
         email: 'dev@example.com',
         email_verified: true,
-        // @ts-expect-error 2322 null is not assignable to type (strictNullChecks)
-        role: passedUserRole || appSecurity?.default?.role,
+        ...(appMemberRole ? { role: appMemberRole } : {}),
+        roles: appMemberRole ? [appMemberRole] : [],
         demo: false,
         zoneinfo: '',
         properties: {},
+        $seed: false,
+        $ephemeral: false,
     };
     const appMembers = [appMemberInfo];
     const allowedGroupRoles = ['manager', 'member'];

package/lib/app.js

@@ -27,7 +27,7 @@ import { publishResourcesRecursively } from './resource.js';
  */
 export async function traverseAppDirectory(path, context, formData) {
     let rc;
-    let discoveredContext;
+    let discoveredContext = {};
     let yaml;
     let iconPath;
     let maskableIconPath;
@@ -142,18 +142,15 @@ export async function traverseAppDirectory(path, context, formData) {
                 break;
         }
     });
-    // @ts-expect-error 2454 Variable used before it was assigned
     if (yaml === undefined) {
         throw new AppsembleError('No app definition found');
     }
-    discoveredContext || (discoveredContext = {});
-    // @ts-expect-error 2454 Variable used before it was assigned
-    // eslint-disable-next-line prettier/prettier
-    discoveredContext.icon = discoveredContext.icon ? resolve(path, discoveredContext.icon) : iconPath;
-    // @ts-expect-error 2454 Variable used before it was assigned
-    // eslint-disable-next-line prettier/prettier
-    discoveredContext.maskableIcon = discoveredContext.maskableIcon ? resolve(path, discoveredContext.maskableIcon) : maskableIconPath;
-    // @ts-expect-error 2454 Variable used before it was assigned
+    discoveredContext.icon = discoveredContext.icon
+        ? resolve(path, discoveredContext.icon)
+        : iconPath;
+    discoveredContext.maskableIcon = discoveredContext.maskableIcon
+        ? resolve(path, discoveredContext.maskableIcon)
+        : maskableIconPath;
     return [discoveredContext, rc, yaml, gatheredData];
 }
 function extractFilenameFromContentDisposition(contentDisposition) {
@@ -165,7 +162,7 @@ function extractFilenameFromContentDisposition(contentDisposition) {
 }
 async function retrieveContext(path, context) {
     let rc;
-    let discoveredContext;
+    let discoveredContext = {};
     let iconPath;
     let maskableIconPath;
     await opendirSafe(path, async (filepath, filestat) => {
@@ -189,13 +186,12 @@ async function retrieveContext(path, context) {
                 break;
         }
     });
-    discoveredContext || (discoveredContext = {});
-    // @ts-expect-error 2454 Variable used before it was assigned
-    // eslint-disable-next-line prettier/prettier
-    discoveredContext.icon = discoveredContext.icon ? resolve(path, discoveredContext.icon) : iconPath;
-    // @ts-expect-error 2454 Variable used before it was assigned
-    // eslint-disable-next-line prettier/prettier
-    discoveredContext.maskableIcon = discoveredContext.maskableIcon ? resolve(path, discoveredContext.maskableIcon) : maskableIconPath;
+    discoveredContext.icon = discoveredContext.icon
+        ? resolve(path, discoveredContext.icon)
+        : iconPath;
+    discoveredContext.maskableIcon = discoveredContext.maskableIcon
+        ? resolve(path, discoveredContext.maskableIcon)
+        : maskableIconPath;
     return discoveredContext;
 }
 /**
@@ -329,6 +325,15 @@ export async function publishSeedResources(path, app, remote) {
         logger.warn(`Missing resources directory in ${path}. Skipping...`);
     }
 }
+function normalizeSeedAppMemberRoles(roles, role) {
+    return Array.from(new Set((Array.isArray(roles) ? roles : roles ? [roles] : role ? [role] : []).filter(Boolean)));
+}
+function normalizeSeedAppMembers(members) {
+    return members.map(({ role, roles, ...member }) => ({
+        ...member,
+        roles: normalizeSeedAppMemberRoles(roles, role),
+    }));
+}
 export async function publishSeedAppMembers(path, app, remote) {
     const membersPath = join(path, 'members', 'index.json');
     logger.info(`Publishing seed app members from ${membersPath}`);
@@ -339,7 +344,7 @@ export async function publishSeedAppMembers(path, app, remote) {
                 baseURL: remote,
             });
             const membersContent = await readFile(membersPath, 'utf8');
-            const members = JSON.parse(membersContent);
+            const members = normalizeSeedAppMembers(JSON.parse(membersContent));
             await axios({
                 url: `/api/apps/${app.id}/demo-members`,
                 baseURL: remote,
@@ -350,8 +355,12 @@ export async function publishSeedAppMembers(path, app, remote) {
         }
         catch (error) {
             logger.error(error);
+            throw error;
         }
     }
+    else {
+        logger.warn(`Missing members directory in ${path}. Skipping...`);
+    }
 }
 export async function publishSeedAssets(path, app, remote, assetsClonable) {
     const assetsPath = join(path, 'assets');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/cli",
-  "version": "0.36.10-test.2",
+  "version": "0.36.10-test.4",
   "description": "The CLI for developing with Appsemble apps and blocks",
   "keywords": [
     "app",
@@ -44,10 +44,10 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/node-utils": "0.36.10-test.2",
-    "@appsemble/types": "0.36.10-test.2",
-    "@appsemble/lang-sdk": "0.36.10-test.2",
-    "@appsemble/utils": "0.36.10-test.2",
+    "@appsemble/node-utils": "0.36.10-test.4",
+    "@appsemble/types": "0.36.10-test.4",
+    "@appsemble/lang-sdk": "0.36.10-test.4",
+    "@appsemble/utils": "0.36.10-test.4",
     "@fortawesome/fontawesome-common-types": "^6.0.0",
     "@inquirer/prompts": "^8.0.0",
     "@koa/cors": "^5.0.0",
@@ -89,8 +89,8 @@
     "yargs": "^17.0.0"
   },
   "devDependencies": {
-    "@appsemble/types": "0.36.10-test.2",
-    "@appsemble/server": "0.36.10-test.2",
+    "@appsemble/types": "0.36.10-test.4",
+    "@appsemble/server": "0.36.10-test.4",
     "@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.36.10-test.2
+        version: 0.36.10-test.4
         parameters:
           icon: arrow-right
         actions:
@@ -17,7 +17,7 @@ pages:
   - name: Example Page B
     blocks:
       - type: action-button
-        version: 0.36.10-test.2
+        version: 0.36.10-test.4
         parameters:
           icon: arrow-left
         actions:

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

@@ -5,7 +5,7 @@
     "*.css"
   ],
   "dependencies": {
-    "@appsemble/sdk": "0.36.10-test.2",
+    "@appsemble/sdk": "0.36.10-test.4",
     "mini-jsx": "^4.0.0"
   }
 }

package/templates/blocks/preact/package.json

@@ -5,8 +5,8 @@
     "*.css"
   ],
   "dependencies": {
-    "@appsemble/preact": "0.36.10-test.2",
-    "@appsemble/sdk": "0.36.10-test.2",
+    "@appsemble/preact": "0.36.10-test.4",
+    "@appsemble/sdk": "0.36.10-test.4",
     "preact": "^10.0.0"
   }
 }

package/templates/blocks/vanilla/package.json

@@ -5,6 +5,6 @@
     "*.css"
   ],
   "dependencies": {
-    "@appsemble/sdk": "0.36.10-test.2"
+    "@appsemble/sdk": "0.36.10-test.4"
   }
 }