@appsemble/node-utils 0.28.11 → 0.28.13

package/README.md

@@ -1,9 +1,9 @@
-# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.28.11/config/assets/logo.svg) Appsemble Node Utilities
+# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.28.13/config/assets/logo.svg) Appsemble Node Utilities
 
 > NodeJS utilities used by Appsemble internally.
 
 [![npm](https://img.shields.io/npm/v/@appsemble/node-utils)](https://www.npmjs.com/package/@appsemble/node-utils)
-[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.28.11/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.28.11)
+[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.28.13/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.28.13)
 [![Prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://prettier.io)
 
 ## Table of Contents
@@ -26,5 +26,5 @@ compatibility is not guaranteed.
 
 ## License
 
-[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.28.11/LICENSE.md) ©
+[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.28.13/LICENSE.md) ©
 [Appsemble](https://appsemble.com)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/node-utils",
-  "version": "0.28.11",
+  "version": "0.28.13",
   "description": "NodeJS utilities used by Appsemble internally.",
   "keywords": [
     "app",
@@ -38,8 +38,8 @@
     "test": "vitest"
   },
   "dependencies": {
-    "@appsemble/types": "0.28.11",
-    "@appsemble/utils": "0.28.11",
+    "@appsemble/types": "0.28.13",
+    "@appsemble/utils": "0.28.13",
     "@formatjs/fast-memoize": "^2.0.0",
     "@fortawesome/fontawesome-free": "^6.0.0",
     "@koa/cors": "^4.0.0",

package/resource.d.ts

@@ -1,8 +1,9 @@
 import { type PreparedAsset } from '@appsemble/node-utils';
-import { type App, type ResourceDefinition } from '@appsemble/types';
+import { type App, type ResourceDefinition, type Resource as ResourceType } from '@appsemble/types';
 import { type PreValidatePropertyFunction } from 'jsonschema';
-import { type Context } from 'koa';
+import { type Context, type DefaultContext, type DefaultState, type ParameterizedContext } from 'koa';
 import { type File } from 'koas-body-parser';
+export declare function stripResource({ $author, $created, $editor, $ephemeral, $seed, $updated, ...data }: ResourceType): Record<string, unknown>;
 /**
  * Get the resource definition of an app by name.
  *
@@ -25,7 +26,7 @@ export declare function getResourceDefinition(app: App, resourceType: string, ct
  *   2. A list of newly uploaded assets which should be linked to the resources.
  *   3. preValidateProperty function used for reconstructing resources from a CSV file.
  */
-export declare function extractResourceBody(ctx: Context): [Record<string, unknown> | Record<string, unknown>[], File[], PreValidatePropertyFunction];
+export declare function extractResourceBody(ctx: Context | ParameterizedContext<DefaultState, DefaultContext, any>): [Record<string, unknown> | Record<string, unknown>[], File[], PreValidatePropertyFunction];
 /**
  * Process an incoming resource request body.
  *
@@ -36,13 +37,14 @@ export declare function extractResourceBody(ctx: Context): [Record<string, unkno
  * @param knownAssetIds A list of asset IDs that are already known to be linked to the resource.
  * @param knownExpires A previously known expires value.
  * @param knownAssetNameIds A list of asset ids with asset names that already exist.
+ * @param [isPatch] if the "PATCH" HTTP method is being used.
  * @returns A tuple which consists of:
  *
  *   1. One or more resources processed from the request body.
  *   2. A list of newly uploaded assets which should be linked to the resources.
  *   3. Asset IDs from the `knownAssetIds` array which are no longer used.
  */
-export declare function processResourceBody(ctx: Context, definition: ResourceDefinition, knownAssetIds?: string[], knownExpires?: Date, knownAssetNameIds?: {
+export declare function processResourceBody(ctx: Context | ParameterizedContext<DefaultState, DefaultContext, any>, definition: ResourceDefinition, knownAssetIds?: string[], knownExpires?: Date, knownAssetNameIds?: {
     id: string;
     name: string;
-}[]): [Record<string, unknown> | Record<string, unknown>[], PreparedAsset[], string[]];
+}[], isPatch?: boolean): [Record<string, unknown> | Record<string, unknown>[], PreparedAsset[], string[]];

package/resource.js

@@ -5,7 +5,7 @@ import { ValidationError, Validator } from 'jsonschema';
 import parseDuration from 'parse-duration';
 import { preProcessCSV } from './csv.js';
 import { throwKoaError } from './koa.js';
-function stripResource({ $author, $created, $editor, $ephemeral, $updated, ...data }) {
+export function stripResource({ $author, $created, $editor, $ephemeral, $seed, $updated, ...data }) {
     return data;
 }
 /**
@@ -59,22 +59,27 @@ export function getResourceDefinition(app, resourceType, ctx, view) {
  *   3. preValidateProperty function used for reconstructing resources from a CSV file.
  */
 export function extractResourceBody(ctx) {
+    var _a, _b;
     let body;
     let assets;
     let preValidateProperty;
-    if (ctx.is('multipart/form-data')) {
+    if (((_a = ctx === null || ctx === void 0 ? void 0 : ctx.request) === null || _a === void 0 ? void 0 : _a.body) && ctx.is('multipart/form-data')) {
         ({ assets = [], resource: body } = ctx.request.body);
         if (Array.isArray(body) && body.length === 1) {
             [body] = body;
         }
     }
-    else {
+    else if ((_b = ctx === null || ctx === void 0 ? void 0 : ctx.request) === null || _b === void 0 ? void 0 : _b.body) {
         if (ctx.is('text/csv')) {
             preValidateProperty = preProcessCSV;
         }
         ({ body } = ctx.request);
         assets = [];
     }
+    else {
+        ({ body } = ctx);
+        assets = [];
+    }
     return [
         Array.isArray(body) ? body.map(stripResource) : stripResource(body),
         assets,
@@ -91,14 +96,15 @@ export function extractResourceBody(ctx) {
  * @param knownAssetIds A list of asset IDs that are already known to be linked to the resource.
  * @param knownExpires A previously known expires value.
  * @param knownAssetNameIds A list of asset ids with asset names that already exist.
+ * @param [isPatch] if the "PATCH" HTTP method is being used.
  * @returns A tuple which consists of:
  *
  *   1. One or more resources processed from the request body.
  *   2. A list of newly uploaded assets which should be linked to the resources.
  *   3. Asset IDs from the `knownAssetIds` array which are no longer used.
  */
-export function processResourceBody(ctx, definition, knownAssetIds = [], knownExpires, knownAssetNameIds = []) {
-    var _a;
+export function processResourceBody(ctx, definition, knownAssetIds = [], knownExpires, knownAssetNameIds = [], isPatch = false) {
+    var _a, _b;
     const [resource, assets, preValidateProperty] = extractResourceBody(ctx);
     const validator = new Validator();
     const assetIdMap = new Map();
@@ -131,7 +137,7 @@ export function processResourceBody(ctx, definition, knownAssetIds = [], knownEx
     };
     const patchedSchema = {
         ...definition.schema,
-        required: ctx.request.method === 'PATCH' ? [] : definition.schema.required,
+        required: ((_a = ctx.request) === null || _a === void 0 ? void 0 : _a.method) === 'PATCH' || isPatch ? [] : definition.schema.required,
         properties: {
             ...definition.schema.properties,
             id: { type: 'integer' },
@@ -146,7 +152,7 @@ export function processResourceBody(ctx, definition, knownAssetIds = [], knownEx
                 ],
             },
             $clonable: { type: 'boolean' },
-            ...Object.fromEntries(Object.values((_a = definition.references) !== null && _a !== void 0 ? _a : {}).map((reference) => [
+            ...Object.fromEntries(Object.values((_b = definition.references) !== null && _b !== void 0 ? _b : {}).map((reference) => [
                 `$${reference.resource}`,
                 { type: 'integer' },
             ])),