Update SDK

SkygearIO · Nov 13, 2019 · 7d3565d · 7d3565d
2 parents 1909cf6 + 681d619
commit 7d3565d
Show file tree

Hide file tree

Showing 48 changed files with 792 additions and 784 deletions.
diff --git a/.prettierignore b/.prettierignore
diff --git a/.prettierrc b/.prettierrc
@@ -1,5 +1,3 @@
 {
-  "arrowParens": "always",
-  "bracketSpacing": true,
-  "singleQuote": true,
+  "trailingComma": "es5"
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
   "homepage": "https://skygear.io/",
   "dependencies": {
     "@babel/polyfill": "^7.4.4",
-    "@skygear/node-client": "2.0.0-alpha.15",
+    "@skygear/node-client": "2.0.0-alpha.16",
     "@zeit/dockerignore": "0.0.5",
     "chalk": "^2.4.2",
     "cli-table3": "^0.5.1",

diff --git a/src/@types/gunzip-maybe/index.d.ts b/src/@types/gunzip-maybe/index.d.ts
@@ -1,5 +1,5 @@
-declare module 'gunzip-maybe' {
-  import stream = require('stream');
+declare module "gunzip-maybe" {
+  import stream = require("stream");
 
   function gunzip(): stream.Transform;
   export = gunzip;

diff --git a/src/@types/tar-fs/index.d.ts b/src/@types/tar-fs/index.d.ts
@@ -1,6 +1,6 @@
-declare module 'tar-fs' {
-  import fs = require('fs');
-  import stream = require('stream');
+declare module "tar-fs" {
+  import fs = require("fs");
+  import stream = require("stream");
 
   // Replace these return values with the value of tar-stream when it becomes available
   export function pack(cwd: string, opts?: PackOptions): stream.Readable;
@@ -37,7 +37,7 @@ declare module 'tar-fs' {
     mode: number;
     mtime: Date;
     size: number;
-    type: 'file' | 'directory' | 'link' | 'symlink';
+    type: "file" | "directory" | "link" | "symlink";
     uid: number;
     gid: number;
   }

diff --git a/src/commands/app.ts b/src/commands/app.ts
@@ -1,13 +1,13 @@
-import { Arguments, createCommand, getCommandGroupHelpMessage } from '../util';
-import appCreate from './app/create';
-import appList from './app/list';
-import appDeploy from './app/deploy';
-import appScaffold from './app/scaffold';
-import viewUserConfig from './app/viewUserConfig';
-import updateUserConfig from './app/updateUserConfig';
-import addCollaborator from './app/addCollaborator';
-import listCollaborator from './app/listCollaborator';
-import removeCollaboartor from './app/removeCollaboartor';
+import { Arguments, createCommand, getCommandGroupHelpMessage } from "../util";
+import appCreate from "./app/create";
+import appList from "./app/list";
+import appDeploy from "./app/deploy";
+import appScaffold from "./app/scaffold";
+import viewUserConfig from "./app/viewUserConfig";
+import updateUserConfig from "./app/updateUserConfig";
+import addCollaborator from "./app/addCollaborator";
+import listCollaborator from "./app/listCollaborator";
+import removeCollaboartor from "./app/removeCollaboartor";
 
 const subCommands = [
   appCreate,
@@ -18,19 +18,19 @@ const subCommands = [
   updateUserConfig,
   addCollaborator,
   removeCollaboartor,
-  listCollaborator
+  listCollaborator,
 ];
 
 function run(_argv: Arguments) {
-  console.log(getCommandGroupHelpMessage('app', subCommands));
+  console.log(getCommandGroupHelpMessage("app", subCommands));
   return Promise.resolve();
 }
 
 export default createCommand({
-  builder: (yargs) => {
+  builder: yargs => {
     return subCommands.reduce((y, cmd) => y.command(cmd as any), yargs);
   },
-  command: 'app',
-  describe: 'Skycli app commands',
-  handler: run
+  command: "app",
+  describe: "Skycli app commands",
+  handler: run,
 });
diff --git a/src/commands/app/addCollaborator.ts b/src/commands/app/addCollaborator.ts
@@ -1,15 +1,15 @@
-import chalk from 'chalk';
+import chalk from "chalk";
 
-import { Arguments, createCommand } from '../../util';
-import { requireApp, requireClusterConfig, requireUser } from '../middleware';
-import { cliContainer } from '../../container';
+import { Arguments, createCommand } from "../../util";
+import { requireApp, requireClusterConfig, requireUser } from "../middleware";
+import { cliContainer } from "../../container";
 
 async function run(argv: Arguments) {
-  const appName = argv.context.app || '';
+  const appName = argv.context.app || "";
   const email = argv.email as string;
 
   if (!email) {
-    throw new Error('Email is required.');
+    throw new Error("Email is required.");
   }
 
   const invited = await cliContainer.addCollaborator(appName, email);
@@ -21,18 +21,18 @@ async function run(argv: Arguments) {
 }
 
 export default createCommand({
-  builder: (yargs) => {
+  builder: yargs => {
     return yargs
       .middleware(requireClusterConfig)
       .middleware(requireUser)
       .middleware(requireApp)
-      .demandOption(['email'])
-      .option('email', {
-        type: 'string',
-        describe: `Developer's email`
+      .demandOption(["email"])
+      .option("email", {
+        type: "string",
+        describe: `Developer's email`,
       });
   },
-  command: 'add-collaborator [email]',
-  describe: 'Add developer as collaborator by email',
-  handler: run
+  command: "add-collaborator [email]",
+  describe: "Add developer as collaborator by email",
+  handler: run,
 });
diff --git a/src/commands/app/create.ts b/src/commands/app/create.ts
@@ -1,30 +1,30 @@
-import chalk from 'chalk';
-import inquirer from 'inquirer';
+import chalk from "chalk";
+import inquirer from "inquirer";
 
-import { Arguments, createCommand } from '../../util';
-import { requireClusterConfig, requireUser } from '../middleware';
-import AppScaffoldCommand from './scaffold';
-import { cliContainer } from '../../container';
+import { Arguments, createCommand } from "../../util";
+import { requireClusterConfig, requireUser } from "../middleware";
+import AppScaffoldCommand from "./scaffold";
+import { cliContainer } from "../../container";
 
 const appNamePrompt: inquirer.Question = {
-  message: 'What is your app name?',
-  name: 'app',
-  type: 'input',
-  validate: (input) => {
-    if (input.trim() === '') {
-      return 'App name is required.';
+  message: "What is your app name?",
+  name: "app",
+  type: "input",
+  validate: input => {
+    if (input.trim() === "") {
+      return "App name is required.";
     }
     if (!input.match(/^[A-Za-z0-9]+$/i)) {
-      return 'Invalid app name, only alphabetical letters and numbers are allowed.';
+      return "Invalid app name, only alphabetical letters and numbers are allowed.";
     }
     return true;
-  }
+  },
 };
 
 function ask() {
-  return inquirer.prompt([appNamePrompt]).then((answers) => {
+  return inquirer.prompt([appNamePrompt]).then(answers => {
     return {
-      ...answers
+      ...answers,
     };
   });
 }
@@ -33,12 +33,12 @@ function confirmScaffoldApp() {
   return inquirer.prompt([
     {
       message:
-        'Do you want to scaffold your app now? ' +
-        'Or you can do it later by `skycli app scaffold` command.\n' +
-        'Scaffold now?',
-      name: 'scaffoldNow',
-      type: 'confirm'
-    }
+        "Do you want to scaffold your app now? " +
+        "Or you can do it later by `skycli app scaffold` command.\n" +
+        "Scaffold now?",
+      name: "scaffoldNow",
+      type: "confirm",
+    },
   ]);
 }
 
@@ -54,7 +54,7 @@ async function run(argv: Arguments) {
   }
 
   console.log(chalk`App name: {green ${appName}}.`);
-  console.log('Creating app...');
+  console.log("Creating app...");
 
   const payload = await cliContainer.createApp(appName);
   const userConfig = payload[1];
@@ -63,11 +63,11 @@ async function run(argv: Arguments) {
 
   console.log(chalk`Your API endpoint: {green ${endpoint}}.`);
   console.log(
-    chalk`Your API Key: {green ${firstClient ? firstClient.api_key : ''}}.`
+    chalk`Your API Key: {green ${firstClient ? firstClient.api_key : ""}}.`
   );
-  console.log(chalk`Your Master Key: {green ${userConfig.master_key || ''}}.`);
+  console.log(chalk`Your Master Key: {green ${userConfig.master_key || ""}}.`);
 
-  console.log('Created app successfully! \n');
+  console.log("Created app successfully! \n");
 
   const answers = await confirmScaffoldApp();
   if (!answers.scaffoldNow) {
@@ -80,21 +80,21 @@ async function run(argv: Arguments) {
   return AppScaffoldCommand.execute({
     ...argv,
     app: appName,
-    dest: '.'
+    dest: ".",
   });
 }
 
 export default createCommand({
-  builder: (yargs) => {
+  builder: yargs => {
     return yargs
       .middleware(requireClusterConfig)
       .middleware(requireUser)
-      .option('app', {
-        desc: 'App name',
-        type: 'string'
+      .option("app", {
+        desc: "App name",
+        type: "string",
       });
   },
-  command: 'create',
-  describe: 'Create Skygear app',
-  handler: run
+  command: "create",
+  describe: "Create Skygear app",
+  handler: run,
 });
diff --git a/src/commands/app/deploy.test.ts b/src/commands/app/deploy.test.ts
@@ -1,51 +1,51 @@
-import { createFolderToPathsMapForArchive } from './deploy';
+import { createFolderToPathsMapForArchive } from "./deploy";
 
-test('createFolderToPathsMapForArchive with template', async () => {
+test("createFolderToPathsMapForArchive with template", async () => {
   const result = await createFolderToPathsMapForArchive(
     {
-      type: 'http-service',
-      context: 'fixture/deploy/user_code',
-      path: '',
-      port: 8000
+      type: "http-service",
+      context: "fixture/deploy/user_code",
+      path: "",
+      port: 8000,
     },
-    'fixture/deploy/template'
+    "fixture/deploy/template"
   );
 
   for (const key of Object.keys(result)) {
     result[key] = result[key].sort();
   }
 
   const expected = {
-    'fixture/deploy/user_code': ['.skyignore', 'src/index.js'],
-    'fixture/deploy/template': ['.dockerignore', 'Dockerfile']
+    "fixture/deploy/user_code": [".skyignore", "src/index.js"],
+    "fixture/deploy/template": [".dockerignore", "Dockerfile"],
   };
   expect(expected).toEqual(result);
 });
 
-test('createFolderToPathsMapForArchive should not provide .dockerignore with template', async () => {
+test("createFolderToPathsMapForArchive should not provide .dockerignore with template", async () => {
   await expect(
     createFolderToPathsMapForArchive(
       {
-        type: 'http-service',
-        context: 'fixture/deploy/user_code_with_dockerignore',
-        path: '',
-        port: 8000
+        type: "http-service",
+        context: "fixture/deploy/user_code_with_dockerignore",
+        path: "",
+        port: 8000,
       },
-      'fixture/deploy/template'
+      "fixture/deploy/template"
     )
   ).rejects.toThrow(
-    '.dockerignore is reserved file, please remove it from folder fixture/deploy/user_code_with_dockerignore'
+    ".dockerignore is reserved file, please remove it from folder fixture/deploy/user_code_with_dockerignore"
   );
 });
 
-test('createFolderToPathsMapForArchive without template', async () => {
+test("createFolderToPathsMapForArchive without template", async () => {
   const result = await createFolderToPathsMapForArchive(
     {
-      type: 'http-service',
-      context: 'fixture/deploy/user_code_with_dockerignore',
-      path: '',
+      type: "http-service",
+      context: "fixture/deploy/user_code_with_dockerignore",
+      path: "",
       port: 8000,
-      dockerfile: 'src/Dockerfile'
+      dockerfile: "src/Dockerfile",
     },
     null
   );
@@ -56,13 +56,13 @@ test('createFolderToPathsMapForArchive without template', async () => {
 
   // skycli will not read `.skyignore`, if deploying docker
   const expected = {
-    'fixture/deploy/user_code_with_dockerignore': [
-      '.dockerignore',
-      '.skyignore',
-      'skyignored-file',
-      'src/Dockerfile',
-      'src/index.js'
-    ]
+    "fixture/deploy/user_code_with_dockerignore": [
+      ".dockerignore",
+      ".skyignore",
+      "skyignored-file",
+      "src/Dockerfile",
+      "src/index.js",
+    ],
   };
   expect(expected).toEqual(result);
 });