@m2c2kit/cli 0.1.7 → 0.1.8

package/dist/.env

@@ -1 +1 @@
-CLI_VERSION=0.1.7
+CLI_VERSION=0.1.8

package/dist/cli.js

@@ -266,25 +266,10 @@ await yarg
     if (abort) {
         yarg.exit(1, new Error("user aborted"));
     }
-    // get study code first from command line, then from config file, then assign blank
-    let studyCode = argv["studyCode"] ??
+    // get study code first from command line, then from config file, then generate new one
+    const studyCode = argv["studyCode"] ??
         serverConfig?.studyCode ??
-        "";
-    if (studyCode === "") {
-        const response = await prompts({
-            type: "text",
-            name: "studyCode",
-            message: "study code?",
-            validate: (text) => text.length > 0
-                ? true
-                : "provide a study code (5 random alphanumeric digits, e.g., R5T7A)",
-            onState: (state) => (abort = state.aborted === true),
-        });
-        studyCode = response.studyCode;
-    }
-    if (abort) {
-        yarg.exit(1, new Error("user aborted"));
-    }
+        generateStudyCode();
     // if new url or study code was provided, save these
     if (url !== serverConfig?.url || studyCode !== serverConfig?.studyCode) {
         m2c2kitProjectConfig.set("server", { url, studyCode });

package/dist/templates/package.json.handlebars

@@ -7,8 +7,8 @@
   },
   "private": true,
   "dependencies": {
-    "@m2c2kit/core": "0.1.5",
-    "@m2c2kit/addons": "0.1.5"
+    "@m2c2kit/core": "0.1.6",
+    "@m2c2kit/addons": "0.1.6"
   },
   "devDependencies": {
     "rollup": "2.63.0",

package/dist/templates/starter.ts.handlebars

@@ -339,6 +339,18 @@ class {{className}} extends Game {
   }
 }
 
+// ============================================================================
+
+// When running within an Android webview, the below defines how the session
+// can communicate events to the Android app. Note: the names of this Android
+// namespace and its functions must match the corresponding Android code
+// in addJavascriptInterface() and @JavascriptInterface
+// eslint-disable-next-line @typescript-eslint/no-namespace
+declare namespace Android {
+  function onGameTrialComplete(gameTrialEventAsString: string): void;
+  function onGameLifecycleChange(gameLifecycleEventAsString: string): void;
+}
+
 // default was 3 trials; this is how we can specify a different value
 const game1 = new {{className}}({ TrialNum: 2 });
 
@@ -352,9 +364,14 @@ const session = new Session({
       console.log("data: " + JSON.stringify(e.gameData));
       console.log("trial schema: " + JSON.stringify(e.trialSchema));
       console.log("game parameters: " + JSON.stringify(e.gameParameters));
+
+      // callback to native Android app, if running in that context
+      if (typeof Android !== "undefined") {
+        Android.onGameTrialComplete(JSON.stringify(e));
+      }
     },
-    // onGameEnd() is called when the user is done
-    onGameEnd: (e: GameLifecycleEvent) => {
+    // onGameLifecycleChange() is called when the game lifecycles changes
+    onGameLifecycleChange: (e: GameLifecycleEvent) => {
       if (e.ended) {
         console.log(`user requested exit in game ${e.gameName}`);
         // this session has only one activity, but this is how it would go to
@@ -362,6 +379,11 @@ const session = new Session({
         if (session.nextActivity) {
           session.advanceToNextActivity();
         }
+
+        // callback to native Android app, if running in that context
+        if (typeof Android !== "undefined") {
+          Android.onGameLifecycleChange(JSON.stringify(e));
+        }
       }
     },
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@m2c2kit/cli",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "m2c2kit command line interface",
   "module": "dist/cli.js",
   "files": [