improve ts

.github/workflows/test.yml

@@ -0,0 +1,9 @@
+on: [push]
+name: test
+jobs:
+    test:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v2
+            - run: npm install
+            - run: npm run check

package.json

@@ -6,16 +6,18 @@
     "license": "MIT",
     "main": "./dist/mandarina.js",
     "module": "./dist/mandarina.mjs",
-    "types": "./dist/mandarina.d.ts",
+    "types": "./dist/types.d.ts",
     "type": "module",
     "scripts": {
         "dev": "nodemon --watch ./src --watch ./example --exec \"npm run build && npm run example\" --ext \"ts\"",
-        "build": "node scripts/build.js",
+        "build": "node scripts/build.js && npm run dts",
         "watch": "nodemon --watch ./src --exec \"npm run build\" --ext \"ts\"",
         "build:example": "esbuild example/main.ts --bundle --sourcemap --outfile=example/game.js",
         "dev:example": "esbuild example/main.ts --bundle --outfile=example/game.js --servedir=./example/",
         "watch:example": "esbuild example/main.ts --bundle --outfile=example/game.js --sourcemap --watch --servedir=./example/",
-        "fmt": "eslint --fix src/"
+        "fmt": "eslint --fix src/",
+        "dts": "tsc",
+        "check": "tsc --noEmit"
     },
     "files": [
         "dist/",

scripts/build.js

@@ -144,8 +144,6 @@ function buildTypes() {
             types,
         }),
     );
-
-    writeFile(`${distDir}/mandarina.d.ts`, dts);
 }
 
 buildTypes();

src/actions/audio.ts

@@ -1,5 +1,5 @@
 import type * as KA from "kaboom";
-import { createAction, getGameData } from "../game";
+import { createAction, getGameData } from "game";
 
 export function playAudio(
     channel: string,

src/actions/background.ts

@@ -1,5 +1,6 @@
 import type * as KA from "kaboom";
-import { createAction, getGameData } from "../game";
+import type { VisualAction } from "types";
+import { createAction, getGameData } from "game";
 
 export function showBackground(background: string | KA.Color) {
     const { k } = getGameData();
@@ -48,7 +49,7 @@ export function showBackground(background: string | KA.Color) {
         back() {
             bg.destroy();
         },
-        fadeIn() {
+        fadeIn(this: VisualAction) {
             this.fade = true;
             return this;
         },

src/actions/chapters.ts

@@ -1,4 +1,4 @@
-import { createAction, getGameData } from "../game";
+import { createAction, getGameData } from "game";
 
 export function jump(name: string) {
     return createAction({

src/actions/character.ts

@@ -1,5 +1,5 @@
 import type * as KA from "kaboom";
-import type { VisualAlign } from "../types";
+import type { VisualAction, VisualAlign } from "../types";
 import type { VisuaLEffectsOpt } from "../components/visual";
 import { createAction, getGameData } from "../game";
 import { getSpriteDimensions } from "../util";
@@ -18,7 +18,7 @@ export function showCharacter(
         type: "visual",
         autoskip: true,
         fade: false,
-        start() {
+        start(this: VisualAction) {
             const textbox = m._textbox;
             const comps: KA.Comp[] = [];
 
@@ -54,7 +54,7 @@ export function showCharacter(
             if (this.side) {
                 const moveTweenComp = () => {
                     return {
-                        add() {
+                        add(this: KA.GameObj<any>) {
                             k.tween(
                                 this.pos.x,
                                 alignments[align].x,
@@ -134,7 +134,7 @@ export function hideCharacter(characterId: string) {
             return;
         },
         back() {
-            this.showCharacter(characterId, "default", "center");
+            showCharacter(characterId, "default", "center");
         },
     });
 }

src/actions/textbox.ts

@@ -1,4 +1,4 @@
-import type { Choice } from "../types";
+import type { Action } from "../types";
 import { createAction, getGameData } from "../game";
 import { addChoices } from "../objects/choices";
 
@@ -84,6 +84,11 @@ export function say(...args: string[]) {
 }
 
 // TODO: Implement choices
+export type Choice = {
+    text: string;
+    actions: () => Action[];
+};
+
 export function choice(choices: Choice[]) {
     return createAction({
         id: "choice",

src/components/visual.ts

@@ -1,6 +1,6 @@
 import type * as KA from "kaboom";
-import type { UnionToIntersection } from "../types";
-import { getGameData } from "../game";
+import type { UnionToIntersection } from "types";
+import { getGameData } from "game";
 import { onAddObj } from "../util";
 
 export type VisualEffect = "fade" | "appearFrom";

src/game.ts

@@ -7,11 +7,8 @@ import type {
     LoadImageOpt,
     SpriteData,
     BaseAction,
-    NormalAction,
-    VisualAction,
-    AudioAction,
-} from "./types";
-import { addTextbox } from "./objects/textbox";
+} from "types";
+import { addTextbox } from "objects/textbox";
 
 // Constants
 const LAYERS = [

src/main.ts

@@ -1,13 +1,13 @@
 import type * as KA from "kaboom";
-import type { MandarinaOpt, MandarinaPlugin } from "./types";
+import type { MandarinaOpt, MandarinaPlugin } from "types";
 import kaboom from "kaboom";
-import { startNovel, addChapter, addCharacter, data, loadImage } from "./game";
-import { jump } from "./actions/chapters";
-import { LayerPlugin, layerPlugin } from "./plugins/layer";
-import { showCharacter, hideCharacter } from "./actions/character";
-import { showBackground } from "./actions/background";
-import { playAudio } from "./actions/audio";
-import { say, showTextbox, hideTextbox, choice } from "./actions/textbox";
+import { startNovel, addChapter, addCharacter, data, loadImage } from "game";
+import { jump } from "actions/chapters";
+import { LayerPlugin, layerPlugin } from "plugins/layer";
+import { showCharacter, hideCharacter } from "actions/character";
+import { showBackground } from "actions/background";
+import { playAudio } from "actions/audio";
+import { say, showTextbox, hideTextbox, choice } from "actions/textbox";
 
 export function mandarinaPlugin(
     opt: MandarinaOpt,

src/objects/choices.ts

@@ -1,5 +1,5 @@
-import type { Choice } from "../types";
-import { getGameData } from "../game";
+import type { Choice } from "types";
+import { getGameData } from "game";
 
 export function makeChoice(choice: Choice) {
     const { k } = getGameData();

src/objects/textbox.ts

@@ -16,8 +16,8 @@ function textboxComp(): TextboxComp {
         curChar: 0,
 
         add() {
-            textbox = this.text;
-            namebox = this.name;
+            textbox = this.text!;
+            namebox = this.name!;
         },
         write(this: KA.GameObj, text) {
             // TODO: Pronouns replacement support

src/plugins/layer.ts

@@ -1,4 +1,4 @@
-import type { EmptyComp, KaboomCtx } from "kaboom";
+import type { EmptyComp, KaboomCtx, GameObj } from "kaboom";
 
 export interface LayerPlugin {
     layers: (layersArr: string[], def?: string) => void;
@@ -24,7 +24,7 @@ export function layerPlugin(k: KaboomCtx): LayerPlugin {
         layer(name: string) {
             return {
                 id: "layer",
-                add() {
+                add(this: GameObj<any>) {
                     if (userLayers.indexOf(name) == -1) {
                         throw new Error(`no layer "${name}"`);
                     }

src/types.ts

@@ -1,7 +1,16 @@
 import type * as KA from "kaboom";
-import type { LayerPlugin } from "./plugins/layer";
-export type * from "./components/visual";
-export type { LayerPlugin };
+import type { LayerPlugin } from "plugins/layer";
+import type { Choice } from "actions/textbox";
+export type {
+    VisualComp,
+    VisuaLEffectsOpt,
+    VisualCompOpt,
+    VisualEffect,
+    OptByEffects,
+    FadeEffectOpt,
+    AppearFromEffectOpt,
+} from "./components/visual";
+export type { LayerPlugin, Choice };
 
 // #region Main function
 declare function mandarina(opt?: MandarinaOpt & KA.KaboomOpt): MandarinaPlugin;
@@ -250,13 +259,6 @@ export type CharacterDataOpt = {
 };
 // #endregion
 
-// #region Choices
-export type Choice = {
-    text: string;
-    actions: () => Action[];
-};
-// #endregion
-
 // #region Textbox
 export type Textbox = KA.GameObj<
     KA.PosComp | KA.AnchorComp | KA.OpacityComp | TextboxComp

src/util.ts

@@ -1,6 +1,6 @@
 import type * as KA from "kaboom";
-import { getGameData } from "./game";
-import { VisualAlign } from "./types";
+import { getGameData } from "game";
+import { VisualAlign } from "types";
 
 export function getAlignment(
     align: VisualAlign,

tsconfig.json

@@ -6,6 +6,7 @@
         "emitDeclarationOnly": true,
         "skipLibCheck": true,
         "strict": true,
-        "baseUrl": "./"
-    }
+        "baseUrl": "./src/"
+    },
+    "include": ["./src/*.ts"]
 }