@appsemble/cli 0.38.0 → 0.38.1

package/README.md

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

package/lib/app.js

@@ -1,13 +1,15 @@
-import { cpSync, createReadStream, createWriteStream, existsSync } from 'node:fs';
+import { createReadStream, createWriteStream, existsSync } from 'node:fs';
 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 { normalizeBlockName } from '@appsemble/lang-sdk';
-import { applyAppVariant, AppsembleError, authenticate, logger, opendirSafe, readData, writeData, } from '@appsemble/node-utils';
+import { applyAppVariant, AppsembleError, authenticate, logger, opendirSafe, preProcessCSV, readData, writeData, } from '@appsemble/node-utils';
 import { extractAppMessages, has } from '@appsemble/utils';
 import axios from 'axios';
+import csv from 'csvtojson';
 import fg from 'fast-glob';
 import FormData from 'form-data';
+import { Validator } from 'jsonschema';
 import normalizePath from 'normalize-path';
 import { publishAsset } from './asset.js';
 import { traverseBlockThemes } from './block.js';
@@ -16,7 +18,6 @@ import { getProjectBuildConfig } from './config.js';
 import { printAxiosError } from './output.js';
 import { processCss } from './processCss.js';
 import { buildProject, makeProjectPayload } from './project.js';
-import { publishResourcesRecursively } from './resource.js';
 /**
  * Traverses an app directory and appends the files it finds to the given FormData object.
  *
@@ -105,12 +106,11 @@ export async function traverseAppDirectory(path, context, formData) {
                         const language = supportedLanguages.has(screenshotDirectoryName)
                             ? screenshotDirectoryName
                             : 'unspecified';
-                        const tmpFilePath = join(screenshotDirectoryPath, `${language}-${screenshotName}`);
-                        cpSync(screenshotPath, tmpFilePath);
-                        logger.info(`Adding screenshot ${tmpFilePath} 🖼️`);
-                        formData.append('screenshots', createReadStream(tmpFilePath));
+                        logger.info(`Adding screenshot ${screenshotPath} 🖼️`);
+                        formData.append('screenshots', createReadStream(screenshotPath), {
+                            filename: `${language}-${screenshotName}`,
+                        });
                         gatheredData.screenshotUrls.push(basename(screenshotPath));
-                        rm(tmpFilePath);
                     }
                 }, { allowMissing: true, recursive: true });
             case 'theme':
@@ -274,55 +274,53 @@ export async function deleteApp({ clientCredentials, id, remote }) {
 export async function publishSeedResources(path, app, remote) {
     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}`);
-        try {
-            await axios.delete(`/api/apps/${app.id}/resources`, { baseURL: remote });
-            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({
-                        // @ts-expect-error 2322 null is not assignable to type (strictNullChecks)
-                        appId: app.id,
-                        path: join(resourcesPath, resource.name),
-                        // @ts-expect-error 2322 null is not assignable to type (strictNullChecks)
-                        definition: app.definition.resources?.[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({
-                            // @ts-expect-error 2322 null is not assignable to type (strictNullChecks)
-                            appId: app.id,
-                            path: join(resourcesPath, resource.name, subResource.name),
-                            // @ts-expect-error 2322 null is not assignable to type (strictNullChecks)
-                            definition: app.definition.resources?.[resource.name],
-                            type: resource.name,
-                        });
-                    }
-                }
-            }
-            await publishResourcesRecursively({
-                seed: true,
-                remote,
-                resourcesToPublish,
-                publishedResourcesIds,
-            });
+    if (!existsSync(resourcesPath)) {
+        logger.warn(`Missing resources directory in ${path}. Skipping...`);
+        return;
+    }
+    const batch = {};
+    const resourceFiles = await readdir(resourcesPath, { withFileTypes: true });
+    for (const resource of resourceFiles) {
+        const type = resource.isDirectory() ? resource.name : parse(resource.name).name;
+        const definition = app.definition.resources?.[type];
+        if (!definition) {
+            throw new AppsembleError(`Unknown resource type: ${type}`);
         }
-        catch (error) {
-            logger.error('Something went wrong when publishing seed resources:');
-            logger.error(error);
+        const paths = resource.isDirectory()
+            ? (await readdir(join(resourcesPath, resource.name), { withFileTypes: true }))
+                .filter((entry) => entry.isFile())
+                .map((entry) => join(resourcesPath, resource.name, entry.name))
+            : [join(resourcesPath, resource.name)];
+        batch[type] ?? (batch[type] = []);
+        for (const resourcePath of paths) {
+            const [file] = resourcePath.endsWith('.csv')
+                ? [await csv({ checkType: false }).fromFile(resourcePath)]
+                : await readData(resourcePath);
+            const resources = Array.isArray(file) ? file : [file];
+            if (resources.some((value) => !value || typeof value !== 'object' || Array.isArray(value))) {
+                throw new AppsembleError(`File at ${resourcePath} does not contain an object or array of objects`);
+            }
+            if (resourcePath.endsWith('.csv')) {
+                new Validator().validate(resources, {
+                    type: 'array',
+                    items: {
+                        ...definition.schema,
+                        properties: {
+                            ...definition.schema.properties,
+                            ...Object.fromEntries(Object.values(definition.references ?? {}).map(({ resource: referencedType }) => [
+                                `$${referencedType}`,
+                                { type: 'integer' },
+                            ])),
+                        },
+                    },
+                }, { preValidateProperty: preProcessCSV });
+            }
+            batch[type].push(...resources);
         }
     }
-    else {
-        logger.warn(`Missing resources directory in ${path}. Skipping...`);
+    const { data } = await axios.put(`/api/apps/${app.id}/resources`, batch, { baseURL: remote });
+    for (const [type, ids] of Object.entries(data)) {
+        logger.info(`Successfully published ${ids.length} ${type} seed resource(s)`);
     }
 }
 function normalizeSeedAppMemberRoles(roles, role) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/cli",
-  "version": "0.38.0",
+  "version": "0.38.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.0",
-    "@appsemble/types": "0.38.0",
-    "@appsemble/lang-sdk": "0.38.0",
-    "@appsemble/utils": "0.38.0",
+    "@appsemble/node-utils": "0.38.1",
+    "@appsemble/types": "0.38.1",
+    "@appsemble/lang-sdk": "0.38.1",
+    "@appsemble/utils": "0.38.1",
     "@fortawesome/fontawesome-common-types": "^6.0.0",
     "@inquirer/prompts": "^8.0.0",
     "@koa/cors": "^5.0.0",
@@ -81,7 +81,7 @@
     "prettier": "^3.0.0",
     "raw-body": "^2.0.0",
     "read-package-up": "^11.0.0",
-    "sharp": "0.35.3",
+    "sharp": "0.35.4",
     "ts-json-schema-generator": "^1.0.0",
     "type-fest": "^4.0.0",
     "url": "0.11.4",
@@ -90,8 +90,8 @@
     "yargs": "^17.0.0"
   },
   "devDependencies": {
-    "@appsemble/types": "0.38.0",
-    "@appsemble/server": "0.38.0",
+    "@appsemble/types": "0.38.1",
+    "@appsemble/server": "0.38.1",
     "@types/concat-stream": "2.0.3",
     "@types/koa__cors": "5.0.1",
     "@types/koa-compress": "4.0.7",
@@ -100,7 +100,7 @@
     "@types/postcss-import": "14.0.3",
     "@types/postcss-url": "10.0.4",
     "axios-test-instance": "8.0.0",
-    "bcrypt": "5.1.1",
+    "bcrypt": "6.0.0",
     "big-integer": "1.6.52",
     "concat-stream": "2.0.0",
     "default-browser": "5.5.1",

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

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

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

@@ -5,7 +5,7 @@
     "*.css"
   ],
   "dependencies": {
-    "@appsemble/sdk": "0.38.0",
+    "@appsemble/sdk": "0.38.1",
     "mini-jsx": "^4.0.0"
   }
 }

package/templates/blocks/preact/package.json

@@ -5,8 +5,8 @@
     "*.css"
   ],
   "dependencies": {
-    "@appsemble/preact": "0.38.0",
-    "@appsemble/sdk": "0.38.0",
+    "@appsemble/preact": "0.38.1",
+    "@appsemble/sdk": "0.38.1",
     "preact": "^10.0.0"
   }
 }

package/templates/blocks/vanilla/package.json

@@ -5,6 +5,6 @@
     "*.css"
   ],
   "dependencies": {
-    "@appsemble/sdk": "0.38.0"
+    "@appsemble/sdk": "0.38.1"
   }
 }