talkyjs · renovate · Jul 6, 2020 · Jul 16, 2020 · Jul 16, 2020 · Jul 26, 2020
diff --git a/README.md b/README.md
@@ -7,11 +7,19 @@ We can easy to setup own Alexa custom skill with TypeScript and AWS CloudFormati
 ## Usage
 
 ```
-% ask new  --template-url https://github.com/ask-utils/talkyjs-alexa-skill-template-helloworld.git
+% ask new  --template-url https://github.com/talkyjs/talkyjs-alexa-skill-template-helloworld.git
 
-Please follow the wizard to start your Alexa skill project ->
-? Choose a method to host your skill's backend resources: 
-[Warn]: CLI is about to download the skill template from unofficial template https://github.com/ask-utils/talkyjs-alexa-skill-template-helloworld.git. Please make sure you understand the source code to best protect yourself
+? Choose a method to host your skill's backend resources:  (Use arrow keys)
+❯ Alexa-hosted skills
+  Host your skill code by Alexa (free). 
+  AWS with CloudFormation
+  Host your skill code with AWS services and provision with AWS CloudFormation (requires AWS account) 
+  AWS Lambda
+  Host your skill code on AWS Lambda (requires AWS account). 
+  ──────────────
+  self-hosted and manage your own hosting 
+
+[Warn]: CLI is about to download the skill template from unofficial template https://github.com//talkyjs/talkyjs-alexa-skill-template-helloworld.git. Please make sure you understand the source code to best protect yourself
  from malicious usage.
 ? Would you like to continue download the skill template?  Yes
 ? Please type in your skill name:  talkyjs-alexa-skill-template-helloworld

diff --git a/lambda/.npmignore b/lambda/.npmignore
diff --git a/lambda/package.json b/lambda/package.json
@@ -12,11 +12,12 @@
   "author": "TalkyJS team",
   "license": "MIT",
   "dependencies": {
-    "@talkyjs/core": "0.x",
-    "@ask-utils/router": "3.x",
-    "@ask-utils/speech-script": "3.x",
+    "@talkyjs/core": "1.x",
+    "@talkyjs/ssml": "0.2.0",
     "ask-sdk-core": "^2.6.0",
-    "ask-sdk-model": "^1.18.0"
+    "ask-sdk-model": "^1.18.0",
+    "react": "^17.0.1",
+    "react-dom": "^17.0.1"
   },
   "directories": {
     "lib": "src",
@@ -49,6 +50,8 @@
     "@ask-utils/test": "3.x",
     "@types/jest": "^25.2.1",
     "@types/node": "^13.13.5",
+    "@types/react": "^17.0.0",
+    "@types/react-dom": "^17.0.0",
     "@types/webpack": "^4.41.12",
     "jest": "^26.0.1",
     "source-map-support": "^0.5.19",

diff --git a/lambda/src/HelpIntent/HelpIntent.router.ts b/lambda/src/HelpIntent/HelpIntent.router.ts
@@ -1,4 +1,4 @@
-import { Router } from "@ask-utils/router";
+import { Router } from "@talkyjs/core";
 
 import { HelpIntentScript } from './HelpIntent.speech'
 

diff --git a/lambda/src/HelpIntent/HelpIntent.speech.tsx b/lambda/src/HelpIntent/HelpIntent.speech.tsx
@@ -1,8 +1,5 @@
-/** @jsx ssml */
-import {
-    ssml,
-    SpeechScriptJSX,
-} from '@ask-utils/speech-script'
+import React from 'react';
+import { SpeechScriptJSX } from '@talkyjs/ssml'
 
 export class HelpIntentScript extends SpeechScriptJSX {
     speech() {

diff --git a/lambda/src/HelpIntent/tests/HelpIntent.router.spec.ts b/lambda/src/HelpIntent/tests/HelpIntent.router.spec.ts
@@ -1,5 +1,5 @@
 import { HandlerInputCreator } from '@ask-utils/test';
-import { RequestHandlerFactory } from '@ask-utils/router';
+import { RequestHandlerFactory } from '@talkyjs/core';
 import { RequestHandler } from 'ask-sdk-core';
 import { HelpIntentRouter } from '../HelpIntent.router'
 

diff --git a/lambda/src/HelpIntent/tests/__snapshots__/HelpIntent.router.spec.ts.snap b/lambda/src/HelpIntent/tests/__snapshots__/HelpIntent.router.spec.ts.snap
@@ -0,0 +1,19 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`HelpIntentRouter canHandle should return false when given a not IntentRequest 1`] = `true`;
+
+exports[`HelpIntentRouter handle should match snapshot 1`] = `
+Object {
+  "outputSpeech": Object {
+    "ssml": "<speak><p>Hello! It's a nice development. How are you?</p></speak>",
+    "type": "SSML",
+  },
+  "reprompt": Object {
+    "outputSpeech": Object {
+      "ssml": "<speak><p>How are you?</p></speak>",
+      "type": "SSML",
+    },
+  },
+  "shouldEndSession": false,
+}
+`;
diff --git a/lambda/src/HelpIntent/tests/__snapshots__/HelpIntent.speech.spec.tsx.snap b/lambda/src/HelpIntent/tests/__snapshots__/HelpIntent.speech.spec.tsx.snap
@@ -0,0 +1,17 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`HelpIntentScript should return false when given a not IntentRequest 1`] = `
+Object {
+  "outputSpeech": Object {
+    "ssml": "<speak><p>Hello! It's a nice development. How are you?</p></speak>",
+    "type": "SSML",
+  },
+  "reprompt": Object {
+    "outputSpeech": Object {
+      "ssml": "<speak><p>How are you?</p></speak>",
+      "type": "SSML",
+    },
+  },
+  "shouldEndSession": false,
+}
+`;
diff --git a/lambda/src/LaunchRequest/LaunchRequest.router.ts b/lambda/src/LaunchRequest/LaunchRequest.router.ts
@@ -1,4 +1,4 @@
-import { Router } from "@ask-utils/router";
+import { Router } from "@talkyjs/core";
 
 import { LaunchRequestScript } from './LaunchRequest.speech'
 
@@ -9,7 +9,9 @@ export const LaunchRequestRouter: Router = {
     handler: async (handlerInput) => {
 
 
-        const script = new LaunchRequestScript(handlerInput)
+        const script = new LaunchRequestScript(handlerInput, {
+            dummyProps: "It's a nice development."
+        })
         return script
             .createResponseBuilder()
             .getResponse();

diff --git a/lambda/src/LaunchRequest/LaunchRequest.speech.tsx b/lambda/src/LaunchRequest/LaunchRequest.speech.tsx
@@ -1,14 +1,16 @@
-/** @jsx ssml */
-import {
-    ssml,
-    SpeechScriptJSX,
-} from '@ask-utils/speech-script'
+import React from 'react';
+import { SpeechScriptJSXWithOption } from '@talkyjs/ssml'
 
-export class LaunchRequestScript extends SpeechScriptJSX {
+export class LaunchRequestScript extends SpeechScriptJSXWithOption<{
+    dummyProps: string;
+}> {
     speech() {
         return (
             <speak>
-                <p>Hello! It's a nice development. How are you?</p>
+                <p>
+                    <amazon-emotion name="excited" intensity="high">Hello!</amazon-emotion>
+                    {this.options.dummyProps} How are you?
+                </p>
             </speak>
         )
     }

diff --git a/lambda/src/LaunchRequest/tests/LaunchRequest.router.spec.ts b/lambda/src/LaunchRequest/tests/LaunchRequest.router.spec.ts
@@ -1,5 +1,5 @@
 import { HandlerInputCreator } from '@ask-utils/test';
-import { RequestHandlerFactory } from '@ask-utils/router';
+import { RequestHandlerFactory } from '@talkyjs/core';
 import { RequestHandler } from 'ask-sdk-core';
 import { LaunchRequestRouter } from '../LaunchRequest.router'
 

diff --git a/lambda/src/LaunchRequest/tests/LaunchRequest.speech.spec.tsx b/lambda/src/LaunchRequest/tests/LaunchRequest.speech.spec.tsx
@@ -8,7 +8,9 @@ describe('LaunchRequestScript', () => {
       name: "LaunchRequest",
       confirmationStatus: 'NONE'
     });
-    const script = new LaunchRequestScript(handlerInput);
+    const script = new LaunchRequestScript(handlerInput, {
+      dummyProps: "It's a nice development."
+  });
     expect(script.createResponse()).toMatchSnapshot();
   });
 

diff --git a/lambda/src/LaunchRequest/tests/__snapshots__/LaunchRequest.router.spec.ts.snap b/lambda/src/LaunchRequest/tests/__snapshots__/LaunchRequest.router.spec.ts.snap
@@ -0,0 +1,19 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`LaunchRequestRouter canHandle should return false when given a not IntentRequest 1`] = `false`;
+
+exports[`LaunchRequestRouter handle should match snapshot 1`] = `
+Object {
+  "outputSpeech": Object {
+    "ssml": "<speak><p><amazon:emotion name=\\"excited\\" intensity=\\"high\\">Hello!</amazon:emotion>It's a nice development. How are you?</p></speak>",
+    "type": "SSML",
+  },
+  "reprompt": Object {
+    "outputSpeech": Object {
+      "ssml": "<speak><p>How are you?</p></speak>",
+      "type": "SSML",
+    },
+  },
+  "shouldEndSession": false,
+}
+`;
diff --git a/lambda/src/LaunchRequest/tests/__snapshots__/LaunchRequest.speech.spec.tsx.snap b/lambda/src/LaunchRequest/tests/__snapshots__/LaunchRequest.speech.spec.tsx.snap
@@ -0,0 +1,17 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`LaunchRequestScript should return false when given a not IntentRequest 1`] = `
+Object {
+  "outputSpeech": Object {
+    "ssml": "<speak><p><amazon:emotion name=\\"excited\\" intensity=\\"high\\">Hello!</amazon:emotion>It's a nice development. How are you?</p></speak>",
+    "type": "SSML",
+  },
+  "reprompt": Object {
+    "outputSpeech": Object {
+      "ssml": "<speak><p>How are you?</p></speak>",
+      "type": "SSML",
+    },
+  },
+  "shouldEndSession": false,
+}
+`;
diff --git a/lambda/src/StopAndCancelAndNoIntent/StopAndCancelAndNoIntent.router.ts b/lambda/src/StopAndCancelAndNoIntent/StopAndCancelAndNoIntent.router.ts
@@ -1,4 +1,4 @@
-import { Router } from "@ask-utils/router";
+import { Router } from "@talkyjs/core";
 
 import { StopAndCancelAndNoIntentScript } from './StopAndCancelAndNoIntent.speech'
 

diff --git a/lambda/src/StopAndCancelAndNoIntent/StopAndCancelAndNoIntent.speech.tsx b/lambda/src/StopAndCancelAndNoIntent/StopAndCancelAndNoIntent.speech.tsx
@@ -1,8 +1,5 @@
-/** @jsx ssml */
-import {
-    ssml,
-    SpeechScriptJSX,
-} from '@ask-utils/speech-script'
+import React from 'react';
+import { SpeechScriptJSX } from '@talkyjs/ssml'
 
 export class StopAndCancelAndNoIntentScript extends SpeechScriptJSX {
     speech() {

diff --git a/lambda/src/StopAndCancelAndNoIntent/tests/StopAndCancelAndNoIntent.router.spec.ts b/lambda/src/StopAndCancelAndNoIntent/tests/StopAndCancelAndNoIntent.router.spec.ts
@@ -1,5 +1,5 @@
 import { HandlerInputCreator } from '@ask-utils/test';
-import { RequestHandlerFactory } from '@ask-utils/router';
+import { RequestHandlerFactory } from '@talkyjs/core';
 import { RequestHandler } from 'ask-sdk-core';
 import { StopAndCancelAndNoIntentRouter } from '../StopAndCancelAndNoIntent.router'
 

diff --git a/...StopAndCancelAndNoIntent/tests/__snapshots__/StopAndCancelAndNoIntent.router.spec.ts.snap b/...StopAndCancelAndNoIntent/tests/__snapshots__/StopAndCancelAndNoIntent.router.spec.ts.snap
@@ -0,0 +1,16 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`StopAndCancelAndNoIntentRouter canHandle should match the snapshot of the "AMAZON.CancelIntent" IntentRequest 1`] = `true`;
+
+exports[`StopAndCancelAndNoIntentRouter canHandle should match the snapshot of the "AMAZON.NoIntent" IntentRequest 1`] = `true`;
+
+exports[`StopAndCancelAndNoIntentRouter canHandle should match the snapshot of the "AMAZON.StopIntent" IntentRequest 1`] = `true`;
+
+exports[`StopAndCancelAndNoIntentRouter handle should match snapshot 1`] = `
+Object {
+  "outputSpeech": Object {
+    "ssml": "<speak><p>Good-bye!</p></speak>",
+    "type": "SSML",
+  },
+}
+`;
diff --git a/...topAndCancelAndNoIntent/tests/__snapshots__/StopAndCancelAndNoIntent.speech.spec.tsx.snap b/...topAndCancelAndNoIntent/tests/__snapshots__/StopAndCancelAndNoIntent.speech.spec.tsx.snap
@@ -0,0 +1,28 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`StopAndCancelAndNoIntentScript should match the snapshot of the "AMAZON.CancelIntent" IntentRequest 1`] = `
+Object {
+  "outputSpeech": Object {
+    "ssml": "<speak><p>Good-bye!</p></speak>",
+    "type": "SSML",
+  },
+}
+`;
+
+exports[`StopAndCancelAndNoIntentScript should match the snapshot of the "AMAZON.NoIntent" IntentRequest 1`] = `
+Object {
+  "outputSpeech": Object {
+    "ssml": "<speak><p>Good-bye!</p></speak>",
+    "type": "SSML",
+  },
+}
+`;
+
+exports[`StopAndCancelAndNoIntentScript should match the snapshot of the "AMAZON.StopIntent" IntentRequest 1`] = `
+Object {
+  "outputSpeech": Object {
+    "ssml": "<speak><p>Good-bye!</p></speak>",
+    "type": "SSML",
+  },
+}
+`;
diff --git a/lambda/src/index.ts b/lambda/src/index.ts
@@ -7,10 +7,14 @@ import { StopAndCancelAndNoIntentRouter } from './StopAndCancelAndNoIntent/StopA
 const config: TalkyJSSkillConfig = {
     stage: 'development',                   // [Optional] Skill Stage
     logLevel: 'info',                       // [Optional] Log level
-    database: {                             // [Optional] Database configuration
-        type: "s3",             // [Optional] Database type (none / s3 / dynamodb)
-        tableName: "PUT_YOUR_DB_NAME",         // [Optional] Database table name
-    //    s3PathPrefix: ''                  // [Optional] [Only S3] S3 path prefix
+    //database: {                             // [Optional] Database configuration
+    //    type: "none",                       // [Optional] Database type (none / s3 / dynamodb)
+    //    tableName: '',                      // [Optional] Database table name
+    //  s3PathPrefix: ''                    // [Optional] [Only S3] S3 path prefix
+    //},
+    apiClient: {                            // SMAPI and Alexa API Client configuration
+        useDefault: true,                   // Use DefaultApiClient
+        // client: new DefaultApiClient()   // If you have own ApiClient, put here
     },
     // skillId: '',                         // [Optional] Skill ID
     errorHandler: {                         // [Optional] error handler configurations
@@ -51,4 +55,4 @@ export const createSkillHandler = (skill: CustomSkillBuilder = skillBuilder): Sk
  * @param event 
  * @param context 
  */
-export const handler: SkillHandler = createSkillHandler()
+export const handler: SkillHandler = createSkillHandler()