@appsemble/cli 0.20.13 → 0.20.15

package/index.ts

@@ -1,74 +1,74 @@
 #!/usr/bin/env node
+import process from 'process';
+
 import { configureLogger, handleError } from '@appsemble/node-utils';
 import { cosmiconfig } from 'cosmiconfig';
-import yargs from 'yargs';
+import yargs, { CommandModule } from 'yargs';
 
-import * as app from './commands/app';
-import * as asset from './commands/asset';
-import * as block from './commands/block';
-import * as cleanupResources from './commands/cleanupResources';
-import * as config from './commands/config';
-import * as login from './commands/login';
-import * as logout from './commands/logout';
-import * as migrate from './commands/migrate';
-import * as organization from './commands/organization';
-import * as resource from './commands/resource';
-import * as runCronJobs from './commands/runCronJobs';
-import * as start from './commands/start';
-import * as team from './commands/team';
-import { CREDENTIALS_ENV_VAR } from './lib/authentication';
-import { coerceRemote } from './lib/coercers';
-import { initAxios } from './lib/initAxios';
+import * as app from './commands/app/index.js';
+import * as asset from './commands/asset/index.js';
+import * as block from './commands/block/index.js';
+import * as cleanupResources from './commands/cleanupResources.js';
+import * as config from './commands/config/index.js';
+import * as login from './commands/login.js';
+import * as logout from './commands/logout.js';
+import * as migrate from './commands/migrate.js';
+import * as organization from './commands/organization/index.js';
+import * as resource from './commands/resource/index.js';
+import * as runCronJobs from './commands/runCronJobs.js';
+import * as start from './commands/start.js';
+import * as team from './commands/team/index.js';
+import { CREDENTIALS_ENV_VAR } from './lib/authentication.js';
+import { coerceRemote } from './lib/coercers.js';
+import { initAxios } from './lib/initAxios.js';
+import pkg from './package.json' assert { type: 'json' };
 
 process.title = 'appsemble';
 
-async function main(argv: string[]): Promise<void> {
-  const explorer = cosmiconfig('appsembleServer');
-  const found = await explorer.search(process.cwd());
+const explorer = cosmiconfig('appsembleServer');
+const found = await explorer.search(process.cwd());
 
-  let parser = yargs
-    .option('verbose', {
-      alias: 'v',
-      describe: 'Increase verbosity',
-      type: 'count',
-    })
-    .option('quiet', {
-      alias: 'q',
-      describe: 'Decrease verbosity',
-      type: 'count',
-    })
-    .option('remote', {
-      description: 'The Appsemble host that should be used.',
-      default: 'https://appsemble.app',
-      coerce: coerceRemote,
-    })
-    .option('client-credentials', {
-      description: `OAuth2 client credentials formatted as "client_id:client_secret". This may also be defined in the ${CREDENTIALS_ENV_VAR} environment variable.`,
-    })
-    .middleware([configureLogger, initAxios])
-    .command(app)
-    .command(asset)
-    .command(block)
-    .command(cleanupResources)
-    .command(config)
-    .command(login)
-    .command(logout)
-    .command(migrate)
-    .command(organization)
-    .command(resource)
-    .command(runCronJobs)
-    .command(start)
-    .command(team)
-    .demandCommand(1)
-    // .strict() isn’t used because of https://github.com/yargs/yargs/issues/2058
-    .strictCommands()
-    .fail(handleError)
-    .help()
-    .completion();
-  if (found) {
-    parser = parser.config(found.config);
-  }
-  parser.parse(argv);
+let parser = yargs(process.argv.slice(2))
+  .version(pkg.version)
+  .option('verbose', {
+    alias: 'v',
+    describe: 'Increase verbosity',
+    type: 'count',
+  })
+  .option('quiet', {
+    alias: 'q',
+    describe: 'Decrease verbosity',
+    type: 'count',
+  })
+  .option('remote', {
+    description: 'The Appsemble host that should be used.',
+    default: 'https://appsemble.app',
+    coerce: coerceRemote,
+  })
+  .option('client-credentials', {
+    description: `OAuth2 client credentials formatted as "client_id:client_secret". This may also be defined in the ${CREDENTIALS_ENV_VAR} environment variable.`,
+  })
+  .middleware([configureLogger, initAxios])
+  .command(app)
+  .command(asset)
+  .command(block)
+  .command(cleanupResources as unknown as CommandModule)
+  .command(config)
+  .command(login as unknown as CommandModule)
+  .command(logout as unknown as CommandModule)
+  .command(migrate as unknown as CommandModule)
+  .command(organization)
+  .command(resource)
+  .command(runCronJobs as unknown as CommandModule)
+  .command(start as unknown as CommandModule)
+  .command(team)
+  .demandCommand(1)
+  // .strict() isn’t used because of https://github.com/yargs/yargs/issues/2058
+  .strictCommands()
+  .fail(handleError)
+  .help()
+  .completion();
+if (found) {
+  parser = parser.config(found.config);
 }
-
-main(process.argv.slice(2));
+parser.parse();

package/jest.config.js

@@ -1 +1,3 @@
-module.exports = require('../../config/jest/config')(__dirname);
+import { createJestConfig } from '../../config/jest/config.js';
+
+export default createJestConfig(import.meta);

package/jest.setup.js

@@ -1,6 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const node_utils_1 = require("@appsemble/node-utils");
-(0, node_utils_1.setFixtureBase)(__dirname);
-(0, node_utils_1.setLogLevel)(0);
+import { setFixtureBase, setLogLevel } from '@appsemble/node-utils';
+setFixtureBase(import.meta);
+setLogLevel(0);
 //# sourceMappingURL=jest.setup.js.map

package/jest.setup.js.map

@@ -1 +1 @@
-{"version":3,"file":"jest.setup.js","sourceRoot":"","sources":["jest.setup.ts"],"names":[],"mappings":";;AAAA,sDAAoE;AAEpE,IAAA,2BAAc,EAAC,SAAS,CAAC,CAAC;AAC1B,IAAA,wBAAW,EAAC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"jest.setup.js","sourceRoot":"","sources":["jest.setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpE,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AAC5B,WAAW,CAAC,CAAC,CAAC,CAAC"}

package/jest.setup.ts

@@ -1,4 +1,4 @@
 import { setFixtureBase, setLogLevel } from '@appsemble/node-utils';
 
-setFixtureBase(__dirname);
+setFixtureBase(import.meta);
 setLogLevel(0);

package/lib/__snapshots__/getBlockConfigFromTypeScript.test.ts.snap

@@ -217,7 +217,7 @@ Refer to the block description for more information on the supported data format
     "definitions": {
       "Color": {
         "description": "A hexadecimal color.",
-        "pattern": "^#[a-fA-F\\\\d]{6}$",
+        "pattern": "^#[a-fA-F\\d]{6}$",
         "type": "string",
       },
       "YAxis": {
@@ -1054,7 +1054,7 @@ exports[`getBlockConfigFromTypeScript official blocks filter 1`] = `
     "$schema": "http://json-schema.org/draft-07/schema#",
     "additionalProperties": false,
     "definitions": {
-      "AbstractField<\\"date\\",string>": {
+      "AbstractField<"date",string>": {
         "additionalProperties": false,
         "properties": {
           "defaultValue": {
@@ -2667,7 +2667,7 @@ Note that for \`integer\` type fields are rounded _down_.",
 
 For example, the [\`regex\`](#RegexRequirement) requirement type allows you to validate a field using [Regular Expressions](https://learnxinyminutes.com/docs/pcre/). So for example if you want a string field that requires a field to be an email address that ends with “@appsemble.com”, you could enforce this like so:
 
-\`\`\`yaml type: string requirements:   - regex: \\\\w+@appsemble\\\\.com     errorMessage: Value does not end with “@appsemble.com” \`\`\`",
+\`\`\`yaml type: string requirements:   - regex: \\w+@appsemble\\.com     errorMessage: Value does not end with “@appsemble.com” \`\`\`",
         "properties": {
           "defaultValue": {
             "description": "The default value of the field.",
@@ -2824,13 +2824,13 @@ Replaces the optional label if the field is optional. Won’t display if the fie
           "maxTime": {
             "default": "23:59",
             "description": "The maximum time that can be selected.",
-            "pattern": "^([01]\\\\d|2[0-3]):([0-5]\\\\d)$",
+            "pattern": "^([01]\\d|2[0-3]):([0-5]\\d)$",
             "type": "string",
           },
           "minTime": {
             "default": "00:00",
             "description": "The minimum time that can be selected.",
-            "pattern": "^([01]\\\\d|2[0-3]):([0-5]\\\\d)$",
+            "pattern": "^([01]\\d|2[0-3]):([0-5]\\d)$",
             "type": "string",
           },
         },
@@ -3330,6 +3330,43 @@ If defined, a loader will be shown until this event is triggered.",
 }
 `;
 
+exports[`getBlockConfigFromTypeScript official blocks qr-scan 1`] = `
+{
+  "actions": undefined,
+  "events": {
+    "emit": {
+      "foundQr": {
+        "description": "Event that gets emitted once the qr scanner has identified and resolved a QR code.
+
+foundQr event only holds the string of the QR.",
+      },
+    },
+    "listen": undefined,
+  },
+  "messages": undefined,
+  "parameters": {
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "additionalProperties": false,
+    "properties": {
+      "drawQr": {
+        "default": false,
+        "description": "If true, the block will draw a rectangle around the QR code when it’s found.",
+        "type": "boolean",
+      },
+      "height": {
+        "description": "Video element height",
+        "type": "number",
+      },
+      "width": {
+        "description": "Video element width",
+        "type": "number",
+      },
+    },
+    "type": "object",
+  },
+}
+`;
+
 exports[`getBlockConfigFromTypeScript official blocks stats 1`] = `
 {
   "actions": undefined,
@@ -3740,7 +3777,6 @@ exports[`getBlockConfigFromTypeScript official blocks tiles 1`] = `
     "additionalProperties": false,
     "properties": {
       "color": {
-        "default": "primary",
         "description": "This color is used to fill the background of the tile.
 
 Takes either a hex color or a [Bulma color](https://bulma.io/documentation/helpers/color-helpers)",

package/lib/app.d.ts

@@ -2,7 +2,7 @@
 import { ReadStream } from 'fs';
 import { AppVisibility } from '@appsemble/types';
 import FormData from 'form-data';
-import { AppsembleContext, AppsembleRC } from '../types';
+import { AppsembleContext, AppsembleRC } from '../types.js';
 interface CreateAppParams {
     /**
      * The OAuth2 client credentials to use.