@appsemble/cli 0.36.10 → 0.37.1

package/README.md

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

package/commands/start.js

@@ -159,6 +159,11 @@ export function builder(yargs) {
         desc: 'Use TLS when connecting to the Valkey server.',
         type: 'boolean',
         default: false,
+    })
+        .option('app-serving-cache-ttl', {
+        desc: 'The TTL in seconds for cached app-serving metadata. Set to 0 to disable the cache.',
+        type: 'number',
+        default: 300,
     });
 }
 export async function handler(argv) {

package/lib/config.js

@@ -1,6 +1,7 @@
 import { existsSync } from 'node:fs';
 import { readFile, stat } from 'node:fs/promises';
-import { dirname, join, relative } from 'node:path';
+import { dirname, isAbsolute, join, relative } from 'node:path';
+import { pathToFileURL } from 'node:url';
 import { inspect } from 'node:util';
 import { prefixBlockURL } from '@appsemble/lang-sdk';
 import { AppsembleError, getWorkspaces, logger, readData } from '@appsemble/node-utils';
@@ -396,7 +397,8 @@ export async function getProjectWebpackConfig(buildConfig, mode, outputPath) {
     }
     logger.info(`Using webpack config from ${configPath}`);
     const publicPath = prefixBlockURL({ type: buildConfig.name, version: buildConfig.version }, '');
-    let config = await import(String(configPath));
+    const configSpecifier = isAbsolute(configPath) ? pathToFileURL(configPath).href : configPath;
+    let config = await import(configSpecifier);
     config = await (config.default || config);
     config = config instanceof Function ? await config(buildConfig, { mode, publicPath }) : config;
     // Koa-webpack serves assets on the `output.path` path. Normally this field describes where to

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/cli",
-  "version": "0.36.10",
+  "version": "0.37.1",
   "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",
-    "@appsemble/types": "0.36.10",
-    "@appsemble/lang-sdk": "0.36.10",
-    "@appsemble/utils": "0.36.10",
+    "@appsemble/node-utils": "0.37.1",
+    "@appsemble/types": "0.37.1",
+    "@appsemble/lang-sdk": "0.37.1",
+    "@appsemble/utils": "0.37.1",
     "@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",
-    "@appsemble/server": "0.36.10",
+    "@appsemble/types": "0.37.1",
+    "@appsemble/server": "0.37.1",
     "@types/concat-stream": "2.0.3",
     "@types/koa__cors": "5.0.1",
     "@types/koa-compress": "4.0.7",

package/server/options/deleteAppResource.d.ts

@@ -1,2 +1,2 @@
 import { type DeleteAppResourceParams } from '@appsemble/node-utils';
-export declare function deleteAppResource({ id, type }: DeleteAppResourceParams): Promise<void>;
+export declare function deleteAppResource({ context, id, ifMatch, type, }: DeleteAppResourceParams): Promise<void>;

package/server/options/deleteAppResource.js

@@ -1,5 +1,16 @@
+import { createResourceEtag, matchesResourceIfMatch, throwResourcePreconditionFailedKoaError, } from '@appsemble/node-utils';
 import { Resource } from '../models/Resource.js';
-export function deleteAppResource({ id, type }) {
-    return Resource.deleteOne(id, type);
+import { withResourceLock } from '../utils/resourceLock.js';
+export function deleteAppResource({ context, id, ifMatch, type, }) {
+    return withResourceLock(type, id, async () => {
+        if (ifMatch) {
+            const existing = await Resource.findById(id, type);
+            if (!existing ||
+                !matchesResourceIfMatch(ifMatch, createResourceEtag(existing))) {
+                throwResourcePreconditionFailedKoaError(context, type, id);
+            }
+        }
+        return Resource.deleteOne(id, type);
+    });
 }
 //# sourceMappingURL=deleteAppResource.js.map

package/server/options/getTheme.d.ts

@@ -1,2 +1,2 @@
 import { type GetThemeParams, type Theme as ThemeInterface } from '@appsemble/node-utils';
-export declare function getTheme({ theme }: GetThemeParams): Promise<ThemeInterface>;
+export declare function getTheme({ theme }: GetThemeParams): Promise<ThemeInterface | null>;

package/server/options/getTheme.js

@@ -1,9 +1,6 @@
 import { Theme } from '../models/Theme.js';
 export async function getTheme({ theme }) {
     const persistedTheme = await Theme.findOne({ where: theme });
-    return {
-        // @ts-expect-error 2322 null is not assignable to type (strictNullChecks)
-        css: persistedTheme ? persistedTheme.css : null,
-    };
+    return persistedTheme && { css: persistedTheme.css };
 }
 //# sourceMappingURL=getTheme.js.map

package/server/options/updateAppResource.d.ts

@@ -1,3 +1,3 @@
 import { type UpdateAppResourceParams } from '@appsemble/node-utils';
 import { type Resource as ResourceInterface } from '@appsemble/types';
-export declare function updateAppResource({ id, resource, type, }: UpdateAppResourceParams): Promise<ResourceInterface | null>;
+export declare function updateAppResource({ context, id, ifMatch, resource, type, }: UpdateAppResourceParams): Promise<ResourceInterface | null>;

package/server/options/updateAppResource.js

@@ -1,5 +1,16 @@
+import { createResourceEtag, matchesResourceIfMatch, throwResourcePreconditionFailedKoaError, } from '@appsemble/node-utils';
 import { Resource } from '../models/Resource.js';
-export function updateAppResource({ id, resource, type, }) {
-    return Resource.updateOne(id, resource, type);
+import { withResourceLock } from '../utils/resourceLock.js';
+export function updateAppResource({ context, id, ifMatch, resource, type, }) {
+    return withResourceLock(type, id, async () => {
+        if (ifMatch) {
+            const existing = await Resource.findById(id, type);
+            if (!existing ||
+                !matchesResourceIfMatch(ifMatch, createResourceEtag(existing))) {
+                throwResourcePreconditionFailedKoaError(context, type, id);
+            }
+        }
+        return Resource.updateOne(id, resource, type);
+    });
 }
 //# sourceMappingURL=updateAppResource.js.map

package/server/utils/resourceLock.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Serialize file-backed resource operations against the same (type, id) pair so
+ * the read-then-write pattern used by `updateAppResource`/`deleteAppResource`
+ * cannot interleave with a concurrent writer.
+ *
+ * @param type Resource type, used as part of the lock key.
+ * @param id Resource id, used as part of the lock key.
+ * @param fn Async operation to run while holding the lock.
+ * @returns The resolved value of `fn`.
+ */
+export declare function withResourceLock<T>(type: string, id: number | string, fn: () => Promise<T>): Promise<T>;

package/server/utils/resourceLock.js

@@ -0,0 +1,23 @@
+const queues = new Map();
+/**
+ * Serialize file-backed resource operations against the same (type, id) pair so
+ * the read-then-write pattern used by `updateAppResource`/`deleteAppResource`
+ * cannot interleave with a concurrent writer.
+ *
+ * @param type Resource type, used as part of the lock key.
+ * @param id Resource id, used as part of the lock key.
+ * @param fn Async operation to run while holding the lock.
+ * @returns The resolved value of `fn`.
+ */
+export function withResourceLock(type, id, fn) {
+    const key = `${type}#${id}`;
+    const previous = queues.get(key) ?? Promise.resolve();
+    const next = previous.then(fn, fn);
+    queues.set(key, next.finally(() => {
+        if (queues.get(key) === next) {
+            queues.delete(key);
+        }
+    }));
+    return next;
+}
+//# sourceMappingURL=resourceLock.js.map

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

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

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

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

package/templates/blocks/preact/package.json

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

package/templates/blocks/vanilla/package.json

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