@appsemble/types 0.23.5 → 0.23.6

package/README.md

@@ -1,9 +1,9 @@
-# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.23.5/config/assets/logo.svg) Appsemble Types
+# ![](https://gitlab.com/appsemble/appsemble/-/raw/0.23.6/config/assets/logo.svg) Appsemble Types
 
 > Reusable TypeScript types
 
 [![npm](https://img.shields.io/npm/v/@appsemble/types)](https://www.npmjs.com/package/@appsemble/types)
-[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.23.5/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.23.5)
+[![GitLab CI](https://gitlab.com/appsemble/appsemble/badges/0.23.6/pipeline.svg)](https://gitlab.com/appsemble/appsemble/-/releases/0.23.6)
 [![Prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://prettier.io)
 
 ## Table of Contents
@@ -26,5 +26,5 @@ not guaranteed.
 
 ## License
 
-[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.23.5/LICENSE.md) ©
+[LGPL-3.0-only](https://gitlab.com/appsemble/appsemble/-/blob/0.23.6/LICENSE.md) ©
 [Appsemble](https://appsemble.com)

package/action.d.ts

@@ -43,5 +43,5 @@ export type ResourcePatchAction = RequestLikeAction<'resource.patch'>;
 /**
  * An action that can be called from within a block.
  */
-export type Action = BaseAction<'analytics'> | BaseAction<'condition'> | BaseAction<'dialog.error'> | BaseAction<'dialog.ok'> | BaseAction<'dialog'> | BaseAction<'download'> | BaseAction<'each'> | BaseAction<'email'> | BaseAction<'event'> | BaseAction<'flow.back'> | BaseAction<'flow.cancel'> | BaseAction<'flow.finish'> | BaseAction<'flow.next'> | BaseAction<'flow.to'> | BaseAction<'link.back'> | BaseAction<'link.next'> | BaseAction<'match'> | BaseAction<'message'> | BaseAction<'noop'> | BaseAction<'notify'> | BaseAction<'resource.subscription.status'> | BaseAction<'resource.subscription.subscribe'> | BaseAction<'resource.subscription.toggle'> | BaseAction<'resource.subscription.unsubscribe'> | BaseAction<'share'> | BaseAction<'static'> | BaseAction<'storage.append'> | BaseAction<'storage.delete'> | BaseAction<'storage.read'> | BaseAction<'storage.subtract'> | BaseAction<'storage.update'> | BaseAction<'storage.write'> | BaseAction<'team.invite'> | BaseAction<'team.join'> | BaseAction<'team.list'> | BaseAction<'team.members'> | BaseAction<'throw'> | BaseAction<'user.login'> | BaseAction<'user.logout'> | BaseAction<'user.register'> | BaseAction<'user.update'> | LinkAction | LogAction | RequestAction | ResourceCountAction | ResourceCreateAction | ResourceDeleteAction | ResourceGetAction | ResourcePatchAction | ResourceQueryAction | ResourceUpdateAction;
+export type Action = BaseAction<'analytics'> | BaseAction<'condition'> | BaseAction<'controller'> | BaseAction<'dialog.error'> | BaseAction<'dialog.ok'> | BaseAction<'dialog'> | BaseAction<'download'> | BaseAction<'each'> | BaseAction<'email'> | BaseAction<'event'> | BaseAction<'flow.back'> | BaseAction<'flow.cancel'> | BaseAction<'flow.finish'> | BaseAction<'flow.next'> | BaseAction<'flow.to'> | BaseAction<'link.back'> | BaseAction<'link.next'> | BaseAction<'match'> | BaseAction<'message'> | BaseAction<'noop'> | BaseAction<'notify'> | BaseAction<'resource.subscription.status'> | BaseAction<'resource.subscription.subscribe'> | BaseAction<'resource.subscription.toggle'> | BaseAction<'resource.subscription.unsubscribe'> | BaseAction<'share'> | BaseAction<'static'> | BaseAction<'storage.append'> | BaseAction<'storage.delete'> | BaseAction<'storage.read'> | BaseAction<'storage.subtract'> | BaseAction<'storage.update'> | BaseAction<'storage.write'> | BaseAction<'team.invite'> | BaseAction<'team.join'> | BaseAction<'team.list'> | BaseAction<'team.members'> | BaseAction<'throw'> | BaseAction<'user.login'> | BaseAction<'user.logout'> | BaseAction<'user.register'> | BaseAction<'user.update'> | LinkAction | LogAction | RequestAction | ResourceCountAction | ResourceCreateAction | ResourceDeleteAction | ResourceGetAction | ResourcePatchAction | ResourceQueryAction | ResourceUpdateAction;
 export {};

package/index.d.ts

@@ -35,26 +35,46 @@ export interface OAuth2AuthorizationCode {
      */
     code: string;
 }
+/**
+ * A project that is loaded in an app
+ */
+export interface ControllerDefinition {
+    /**
+     * A mapping of actions that can be fired by the project to action handlers.
+     *
+     * The exact meaning of the parameters depends on the project.
+     */
+    actions?: Record<string, ActionDefinition>;
+    /**
+     * Mapping of the events the project can listen to and emit.
+     *
+     * The exact meaning of the parameters depends on the project.
+     */
+    events?: {
+        listen?: Record<string, string>;
+        emit?: Record<string, string>;
+    };
+}
 /**
  * A block that is displayed on a page.
  */
-export interface BlockDefinition {
+export interface BlockDefinition extends ControllerDefinition {
     /**
-     * The type of the block.
+     * The type of the controller.
      *
-     * A block type follow the format `@organization/name`.
+     * A block type follow the format `@organization/project`.
      * If the organization is _appsemble_, it may be omitted.
      *
      * Pattern:
      * ^(@[a-z]([a-z\d-]{0,30}[a-z\d])?\/)?[a-z]([a-z\d-]{0,30}[a-z\d])$
      *
      * Examples:
-     * - `form`
-     * - `@amsterdam/splash`
+     * - `empty`
+     * - `@amsterdam/empty`
      */
     type: string;
     /**
-     * A [semver](https://semver.org) representation of the block version.
+     * A [semver](https://semver.org) representation of the project version.
      *
      * Pattern:
      * ^\d+\.\d+\.\d+$
@@ -77,30 +97,15 @@ export interface BlockDefinition {
      */
     theme?: Partial<Theme>;
     /**
-     * A free form mapping of named parameters.
-     *
-     * The exact meaning of the parameters depends on the block type.
-     */
-    parameters?: JsonObject;
-    /**
-     * A mapping of actions that can be fired by the block to action handlers.
-     *
-     * The exact meaning of the parameters depends on the block type.
+     * A list of roles that are allowed to view this block.
      */
-    actions?: Record<string, ActionDefinition>;
+    roles?: string[];
     /**
-     * Mapping of the events the block can listen to and emit.
+     * A free form mapping of named parameters.
      *
-     * The exact meaning of the parameters depends on the block type.
+     * The exact meaning of the parameters depends on the project type.
      */
-    events?: {
-        listen?: Record<string, string>;
-        emit?: Record<string, string>;
-    };
-    /**
-     * A list of roles that are allowed to view this block.
-     */
-    roles?: string[];
+    parameters?: JsonObject;
 }
 /**
  * OpenID Connect specifies a set of standard claims about the end-user, which cover common profile
@@ -1132,6 +1137,9 @@ interface ViewResourceDefinition {
      */
     view?: string;
 }
+export interface ControllerActionDefinition extends BaseActionDefinition<'controller'> {
+    handler: string;
+}
 export type RequestActionDefinition = RequestLikeActionDefinition<'request'>;
 export type ResourceCreateActionDefinition = ResourceActionDefinition<'resource.create'>;
 export type ResourceDeleteActionDefinition = ResourceActionDefinition<'resource.delete'>;
@@ -1205,7 +1213,7 @@ export type MessageActionDefinition = BaseActionDefinition<'message'> & BaseMess
      */
     body: Remapper;
 };
-export type ActionDefinition = AnalyticsAction | BaseActionDefinition<'dialog.error'> | BaseActionDefinition<'dialog.ok'> | BaseActionDefinition<'flow.back'> | BaseActionDefinition<'flow.cancel'> | BaseActionDefinition<'flow.finish'> | BaseActionDefinition<'flow.next'> | BaseActionDefinition<'link.back'> | BaseActionDefinition<'link.next'> | BaseActionDefinition<'noop'> | BaseActionDefinition<'team.join'> | BaseActionDefinition<'team.list'> | BaseActionDefinition<'throw'> | ConditionActionDefinition | DialogActionDefinition | DownloadActionDefinition | EachActionDefinition | EmailActionDefinition | EventActionDefinition | FlowToActionDefinition | LinkActionDefinition | LogActionDefinition | MatchActionDefinition | MessageActionDefinition | NotifyActionDefinition | RequestActionDefinition | ResourceCountActionDefinition | ResourceCreateActionDefinition | ResourceDeleteActionDefinition | ResourceGetActionDefinition | ResourcePatchActionDefinition | ResourceQueryActionDefinition | ResourceSubscriptionStatusActionDefinition | ResourceSubscriptionSubscribeActionDefinition | ResourceSubscriptionToggleActionDefinition | ResourceSubscriptionUnsubscribeActionDefinition | ResourceUpdateActionDefinition | ShareActionDefinition | StaticActionDefinition | StorageAppendActionDefinition | StorageDeleteActionDefinition | StorageReadActionDefinition | StorageSubtractActionDefinition | StorageUpdateActionDefinition | StorageWriteActionDefinition | TeamInviteActionDefinition | TeamMembersActionDefinition | UserLoginAction | UserLogoutAction | UserRegisterAction | UserUpdateAction;
+export type ActionDefinition = AnalyticsAction | BaseActionDefinition<'dialog.error'> | BaseActionDefinition<'dialog.ok'> | BaseActionDefinition<'flow.back'> | BaseActionDefinition<'flow.cancel'> | BaseActionDefinition<'flow.finish'> | BaseActionDefinition<'flow.next'> | BaseActionDefinition<'link.back'> | BaseActionDefinition<'link.next'> | BaseActionDefinition<'noop'> | BaseActionDefinition<'team.join'> | BaseActionDefinition<'team.list'> | BaseActionDefinition<'throw'> | ConditionActionDefinition | ControllerActionDefinition | DialogActionDefinition | DownloadActionDefinition | EachActionDefinition | EmailActionDefinition | EventActionDefinition | FlowToActionDefinition | LinkActionDefinition | LogActionDefinition | MatchActionDefinition | MessageActionDefinition | NotifyActionDefinition | RequestActionDefinition | ResourceCountActionDefinition | ResourceCreateActionDefinition | ResourceDeleteActionDefinition | ResourceGetActionDefinition | ResourcePatchActionDefinition | ResourceQueryActionDefinition | ResourceSubscriptionStatusActionDefinition | ResourceSubscriptionSubscribeActionDefinition | ResourceSubscriptionToggleActionDefinition | ResourceSubscriptionUnsubscribeActionDefinition | ResourceUpdateActionDefinition | ShareActionDefinition | StaticActionDefinition | StorageAppendActionDefinition | StorageDeleteActionDefinition | StorageReadActionDefinition | StorageSubtractActionDefinition | StorageUpdateActionDefinition | StorageWriteActionDefinition | TeamInviteActionDefinition | TeamMembersActionDefinition | UserLoginAction | UserLogoutAction | UserRegisterAction | UserUpdateAction;
 export interface ActionType {
     /**
      * Whether or not app creators are required to define this action.
@@ -1222,82 +1230,6 @@ export interface EventType {
      */
     description?: string;
 }
-export interface BlockManifest {
-    /**
-     * A block manifest as it is available to the app and in the SDK.
-     * pattern: ^@[a-z]([a-z\d-]{0,30}[a-z\d])?\/[a-z]([a-z\d-]{0,30}[a-z\d])$
-     * The name of a block.
-     */
-    name: string;
-    /**
-     * The description of the block.
-     */
-    description?: string;
-    /**
-     * The long description of the block.
-     *
-     * This is displayed when rendering block documentation and supports Markdown.
-     */
-    longDescription?: string;
-    /**
-     * A [semver](https://semver.org) representation of the block version.
-     *
-     * Pattern:
-     * ^\d+\.\d+\.\d+$
-     */
-    version: string;
-    /**
-     * The type of layout to be used for the block.
-     */
-    layout?: 'float' | 'grow' | 'hidden' | 'static' | null;
-    /**
-     * Array of urls associated to the files of the block.
-     */
-    files: string[];
-    /**
-     * The actions that are supported by a block.
-     */
-    actions?: Record<string, ActionType>;
-    /**
-     * The messages that are supported by a block.
-     */
-    messages?: Record<string, Record<string, any> | never>;
-    /**
-     * The events that are supported by a block.
-     */
-    events?: {
-        listen?: Record<string, EventType>;
-        emit?: Record<string, EventType>;
-    };
-    /**
-     * A JSON schema to validate block parameters.
-     */
-    parameters?: Schema;
-    /**
-     * The URL that can be used to fetch this block’s icon.
-     */
-    iconUrl?: string;
-    /**
-     * The languages that are supported by the block by default.
-     *
-     * If the block has no messages, this property is `null`.
-     */
-    languages: string[] | null;
-    examples?: string[];
-    /**
-     * Whether the block should be listed publicly
-     * for users who aren’t part of the block’s organization.
-     *
-     * - **`public`**: The block is visible for everyone.
-     * - **`unlisted`**: The block will only be visible if the user is
-     * logged in and is part of the block’s organization.
-     */
-    visibility?: 'public' | 'unlisted';
-    /**
-     * Whether action validation for wildcard action is skipped.
-     */
-    wildcardActions?: boolean;
-}
 /**
  * This describes what a page will look like in the app.
  */
@@ -1495,6 +1427,7 @@ export interface AppDefinition {
      * The pages of the app.
      */
     pages: PageDefinition[];
+    controller?: ControllerDefinition;
     /**
      * Resource definitions that may be used by the app.
      */
@@ -1638,6 +1571,14 @@ export interface App {
      * Any pre-included translations of the app.
      */
     messages?: AppsembleMessages;
+    /**
+     * The build app controller's code
+     */
+    controllerCode?: string;
+    /**
+     * The build app controller's manifest
+     */
+    controllerImplementations?: ProjectImplementations;
     /**
      * Any app styles that are shared.
      */
@@ -1725,7 +1666,7 @@ export interface OrganizationInvite {
     role: string;
 }
 /**
- * A member of an app.
+ * The controller of an app.
  */
 export interface AppMember {
     id: string;
@@ -1992,22 +1933,94 @@ export interface TrainingBlock {
     exampleCode?: string;
 }
 export type SAMLStatus = 'badsignature' | 'emailconflict' | 'invalidrelaystate' | 'invalidsecret' | 'invalidstatuscode' | 'invalidsubjectconfirmation' | 'missingnameid' | 'missingsubject';
-/**
- * The block configuration that’s used by the CLI when building a block.
- *
- * This configuration is also passed to the Webpack configuration function as the `env` variable.
- */
-export interface BlockConfig extends Pick<BlockManifest, 'actions' | 'description' | 'events' | 'layout' | 'longDescription' | 'messages' | 'name' | 'parameters' | 'version' | 'visibility' | 'wildcardActions'> {
+export interface ProjectConfig {
+    /**
+     * The name of the project.
+     */
+    name: string;
     /**
-     * The path to the webpack configuration file relative to the block project directory.
+     * The description of the project.
      */
-    webpack: string;
+    description?: string;
     /**
-     * The build output directory relative to the block project directory.
+     * The long description of the project.
+     *
+     * This is displayed when rendering documentation and supports Markdown.
      */
-    output: string;
+    longDescription?: string;
     /**
-     * The absolute directory of the block project.
+     * A [semver](https://semver.org) representation of the project version.
+     *
+     * Pattern:
+     * ^\d+\.\d+\.\d+$
+     */
+    version: string;
+    [key: string]: any;
+}
+export interface ProjectBuildConfig extends ProjectConfig {
+    /**
+     * The build output directory relative to the project directory.
+     */
+    output?: string;
+    /**
+     * The absolute directory of the project.
      */
     dir: string;
 }
+export interface ProjectImplementations {
+    /**
+     * The actions that are supported by a project.
+     */
+    actions?: Record<string, ActionType>;
+    /**
+     * The events that are supported by a project.
+     */
+    events?: {
+        listen?: Record<string, EventType>;
+        emit?: Record<string, EventType>;
+    };
+    /**
+     * The messages that are supported by a project.
+     */
+    messages?: Record<string, Record<string, any> | never>;
+    /**
+     * A JSON schema to validate project parameters.
+     */
+    parameters?: Schema;
+}
+export interface ProjectManifest extends ProjectConfig, ProjectImplementations {
+    /**
+     * Array of urls associated to the files of the project.
+     */
+    files: string[];
+}
+export interface BlockManifest extends ProjectManifest {
+    /**
+     * The URL that can be used to fetch this block’s icon.
+     */
+    iconUrl?: string;
+    /**
+     * The languages that are supported by the block by default.
+     *
+     * If the block has no messages, this property is `null`.
+     */
+    languages: string[] | null;
+    examples?: string[];
+    /**
+     * Whether the block should be listed publicly
+     * for users who aren’t part of the block’s organization.
+     *
+     * - **`public`**: The block is visible for everyone.
+     * - **`unlisted`**: The block will only be visible if the user is
+     * logged in and is part of the block’s organization.
+     */
+    visibility?: 'public' | 'unlisted';
+    /**
+     * Whether action validation for wildcard action is skipped.
+     */
+    wildcardActions?: boolean;
+    /**
+     * The type of layout to be used for the block.
+     */
+    layout?: 'float' | 'grow' | 'hidden' | 'static' | null;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appsemble/types",
-  "version": "0.23.5",
+  "version": "0.23.6",
   "description": "TypeScript definitions reused within Appsemble internally",
   "keywords": [
     "app",