@appsemble/cli 0.36.5 → 0.36.6

package/README.md

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

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/cli",
-  "version": "0.36.5",
+  "version": "0.36.6",
   "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",
-    "@appsemble/types": "0.36.5",
-    "@appsemble/lang-sdk": "0.36.5",
-    "@appsemble/utils": "0.36.5",
+    "@appsemble/node-utils": "0.36.6",
+    "@appsemble/types": "0.36.6",
+    "@appsemble/lang-sdk": "0.36.6",
+    "@appsemble/utils": "0.36.6",
     "@fortawesome/fontawesome-common-types": "^6.0.0",
     "@inquirer/prompts": "^8.0.0",
     "@koa/cors": "^5.0.0",
@@ -57,7 +57,7 @@
     "comment-parser": "^1.0.0",
     "cosmiconfig": "^7.0.0",
     "csvtojson": "^2.0.0",
-    "esbuild": "^0.26.0",
+    "esbuild": "^0.27.0",
     "fast-glob": "^3.0.0",
     "form-data": "^4.0.4",
     "global-cache-dir": "^6.0.0",
@@ -89,8 +89,8 @@
     "yargs": "^17.0.0"
   },
   "devDependencies": {
-    "@appsemble/types": "0.36.5",
-    "@appsemble/server": "0.36.5",
+    "@appsemble/types": "0.36.6",
+    "@appsemble/server": "0.36.6",
     "@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
+        version: 0.36.6
         parameters:
           icon: arrow-right
         actions:
@@ -17,7 +17,7 @@ pages:
   - name: Example Page B
     blocks:
       - type: action-button
-        version: 0.36.5
+        version: 0.36.6
         parameters:
           icon: arrow-left
         actions:

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

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

package/templates/blocks/preact/package.json

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

package/templates/blocks/vanilla/package.json

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