@appsemble/cli 0.36.5-test.6 → 0.36.6-test.0

package/README.md

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

package/commands/restoreDataFromBackup.js

@@ -3,9 +3,6 @@ export const command = 'restore-data-from-backup';
 export const description = 'Restore appsemble data from a specified backup for the main database and app databases';
 export function builder(yargs) {
     return yargs
-        .option('aesSecret', {
-        desc: 'Aes Secret used for encrypting DB password in the backup DB',
-    })
         .option('database-host', {
         desc: 'The host of the database to connect to. This defaults to the connected database container.',
     })

package/lib/config.d.ts

@@ -1,5 +1,13 @@
 import { type ProjectBuildConfig, type ProjectImplementations } from '@appsemble/types';
+import { type PackageJson } from 'type-fest';
 import { type Configuration } from 'webpack';
+/**
+ * Extract a repository URL from package.json's repository field.
+ *
+ * @param pkg The package.json content.
+ * @returns A URL to the repository, or undefined if not available.
+ */
+export declare function getRepositoryUrl(pkg: PackageJson): string | undefined;
 /**
  * Get the build configuration from a project directory.
  *

package/lib/config.js

@@ -9,6 +9,29 @@ import { parse } from 'comment-parser';
 import { cosmiconfig } from 'cosmiconfig';
 import normalizePath from 'normalize-path';
 import { createFormatter, createParser, SchemaGenerator, ts } from 'ts-json-schema-generator';
+/**
+ * Extract a repository URL from package.json's repository field.
+ *
+ * @param pkg The package.json content.
+ * @returns A URL to the repository, or undefined if not available.
+ */
+export function getRepositoryUrl(pkg) {
+    const repo = pkg.repository;
+    if (!repo) {
+        return undefined;
+    }
+    if (typeof repo === 'string') {
+        return repo;
+    }
+    if (!repo.url) {
+        return undefined;
+    }
+    const baseUrl = repo.url.replace(/\.git$/, '');
+    if (!repo.directory) {
+        return baseUrl;
+    }
+    return `${baseUrl}/-/tree/main/${repo.directory}`;
+}
 /**
  * Get the build configuration from a project directory.
  *
@@ -36,6 +59,7 @@ export async function getProjectBuildConfig(dir) {
         longDescription,
         name: pkg.name,
         version: pkg.version,
+        repositoryUrl: getRepositoryUrl(pkg),
         dir,
         ...config,
     };

package/lib/output.d.ts

@@ -1,2 +1,10 @@
 import { type ValidationError } from 'jsonschema';
+/**
+ * Format validation errors from an Axios response as `file:line:col` messages when possible.
+ *
+ * @param filename The YAML file path shown in the output.
+ * @param yaml The YAML source text.
+ * @param errors The validation errors returned by the API.
+ * @returns A newline-separated list of formatted validation messages.
+ */
 export declare function printAxiosError(filename: string, yaml: string, errors: ValidationError[]): string;

package/lib/output.js

@@ -1,15 +1,58 @@
-import { isNode, LineCounter, parseDocument } from 'yaml';
+import { isAlias, isNode, LineCounter, parseDocument, YAMLMap, YAMLSeq, } from 'yaml';
+/**
+ * Resolve a validation path to the original YAML node, even when the path crosses aliases.
+ *
+ * Validation errors are produced from the fully expanded app definition, but the YAML AST still
+ * contains alias nodes such as `*item-form-fields`. `doc.getIn()` stops at those aliases,
+ * so we walk the path manually and resolve aliases along the way to recover the source node.
+ *
+ * @param doc The parsed YAML document.
+ * @param path The validation error path, e.g. `['form', 'fields', 0, 'type']`.
+ * @returns The YAML node at the given path, or `undefined` if the path is invalid.
+ */
+function getNodeAtPath(doc, path) {
+    function resolveNode(node, docu) {
+        return isAlias(node) ? node.resolve(docu) : node;
+    }
+    let current = doc.contents;
+    for (const segment of path) {
+        current = resolveNode(current, doc);
+        if (current instanceof YAMLMap) {
+            current = current.get(segment, true);
+        }
+        else if (current instanceof YAMLSeq) {
+            if (typeof segment !== 'number') {
+                return undefined;
+            }
+            const item = current.items[segment];
+            current = isNode(item) ? item : undefined;
+        }
+        else {
+            return undefined;
+        }
+        if (current == null) {
+            return undefined;
+        }
+    }
+    return resolveNode(current, doc);
+}
+/**
+ * Format validation errors from an Axios response as `file:line:col` messages when possible.
+ *
+ * @param filename The YAML file path shown in the output.
+ * @param yaml The YAML source text.
+ * @param errors The validation errors returned by the API.
+ * @returns A newline-separated list of formatted validation messages.
+ */
 export function printAxiosError(filename, yaml, errors) {
     const lineCounter = new LineCounter();
     const doc = parseDocument(yaml, { lineCounter });
     return errors
         .map((error) => {
-        const node = doc.getIn(error.path, true);
+        const node = getNodeAtPath(doc, error.path);
         let result = filename;
-        if (isNode(node)) {
-            // @ts-expect-error 2345 argument of type is not assignable to parameter of type
-            // (strictNullChecks)
-            const { col, line } = lineCounter.linePos(node.range?.[0]);
+        if (isNode(node) && node.range) {
+            const { col, line } = lineCounter.linePos(node.range[0]);
             result += `:${line}:${col}`;
         }
         return `${result} ${error.message}`;

package/lib/project.js

@@ -43,7 +43,7 @@ export async function makeProjectPayload(buildConfig) {
     const distPath = output ? resolvePath(dir, output) : undefined;
     const form = new FormData();
     const gatheredData = {};
-    const { description, layout, longDescription, name, version, visibility, wildcardActions } = buildConfig;
+    const { description, layout, longDescription, name, repositoryUrl, version, visibility, wildcardActions, } = buildConfig;
     const { actions, events, messages, parameters } = getProjectImplementations(buildConfig);
     const files = await readdir(dir);
     const icon = files.find((entry) => entry.match(/^icon\.(png|svg)$/));
@@ -64,6 +64,7 @@ export async function makeProjectPayload(buildConfig) {
     append('actions', actions);
     append('description', description);
     append('longDescription', longDescription);
+    append('repositoryUrl', repositoryUrl);
     append('events', events);
     append('layout', layout);
     append('name', name);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/cli",
-  "version": "0.36.5-test.6",
+  "version": "0.36.6-test.0",
   "description": "The CLI for developing with Appsemble apps and blocks",
   "keywords": [
     "app",
@@ -44,10 +44,10 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/node-utils": "0.36.5-test.6",
-    "@appsemble/types": "0.36.5-test.6",
-    "@appsemble/lang-sdk": "0.36.5-test.6",
-    "@appsemble/utils": "0.36.5-test.6",
+    "@appsemble/node-utils": "0.36.6-test.0",
+    "@appsemble/types": "0.36.6-test.0",
+    "@appsemble/lang-sdk": "0.36.6-test.0",
+    "@appsemble/utils": "0.36.6-test.0",
     "@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.5-test.6",
-    "@appsemble/server": "0.36.5-test.6",
+    "@appsemble/types": "0.36.6-test.0",
+    "@appsemble/server": "0.36.6-test.0",
     "@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.5-test.6
+        version: 0.36.6-test.0
         parameters:
           icon: arrow-right
         actions:
@@ -17,7 +17,7 @@ pages:
   - name: Example Page B
     blocks:
       - type: action-button
-        version: 0.36.5-test.6
+        version: 0.36.6-test.0
         parameters:
           icon: arrow-left
         actions:

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

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

package/templates/blocks/preact/package.json

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

package/templates/blocks/vanilla/package.json

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