hzengine-core 0.1.2-dev → 0.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hzengine-core",
-  "version": "0.1.2-dev",
+  "version": "0.1.3",
   "description": "An Visual Novel Engine for Zepp OS",
   "main": "./dist/index.js",
   "types": "./src/index.ts",

package/src/platform/index.ts

@@ -12,15 +12,20 @@ export interface Platform<WidgetFactory = any> {
   isFileSync({ path }: { path: string }): boolean;
   readdirSync(option: Platform.readdirSync.Option): Platform.readdirSync.Result;
   statSync(option: Platform.statSync.Option): Platform.statSync.Result;
-  readFileSync(option: Platform.readFileSync.Option): Platform.readFileSync.Result;
+  readFileSync(
+    option: Platform.readFileSync.Option
+  ): Platform.readFileSync.Result;
   writeFileSync(option: Platform.writeFileSync.Option): void;
 
-  
-
-  getImageInfo(img_path: string): {
-    width: number;
-    height: number;
-  };
+  getImageInfo(img_path: string):
+    | {
+        width: number;
+        height: number;
+      }
+    | Promise<{
+        width: number;
+        height: number;
+      }>;
 
   // timer & async
   getTime(): number; // in Utc
@@ -33,8 +38,6 @@ export interface Platform<WidgetFactory = any> {
 }
 
 export declare namespace Platform {
-
-
   export interface AudioPlayer {
     onPrepared?: (success: boolean) => void | undefined;
     onCompleted?: () => void | undefined;
@@ -43,7 +46,7 @@ export declare namespace Platform {
     stop(): void;
     release(): void;
     getMediaInfo(): MediaInfo;
-    setSource({ path }: { path: string }): void;
+    setSource({ path }: { path: string }): void; //TODO path? file?
   }
 
   export interface MediaInfo {
@@ -154,5 +157,4 @@ export declare namespace Platform {
   }
 }
 
-
-export default Platform;
+export default Platform;

package/src/plugins/transform/animation.ts

@@ -146,7 +146,7 @@ export class Animation<P extends Profile.PropsType = unknown> {
       if (typeof props[key] === "number") {
         if (_former_props[key] == undefined) _former_props[key] = 0;
         res[key] =
-          _former_props[key] + wraped_prog * (props[key] - _former_props[key]);
+          _former_props[key] + wraped_prog * ((props[key] as any) - _former_props[key]);
       } else if (typeof props[key] === "boolean") {
         if (_former_props[key] == undefined) _former_props[key] = false;
         res[key] = wraped_prog === 1 ? props[key] : _former_props[key];

package/src/script/index.ts

@@ -36,6 +36,18 @@ export class Script {
   private accessor _nextRunPosition: [path: string, index: number] | null =
     null;
 
+  public get nextRunPosition() {
+    return this._nextRunPosition;
+  }
+
+  /**
+   * 当前正在执行的命令内容
+   */
+  private _currentRawCommand: string = "-";
+  public get currentRawCommand() {
+    return this._currentRawCommand;
+  }
+
   // Script Run
 
   /**
@@ -61,6 +73,7 @@ export class Script {
     // remove comment
 
     rawCommand = removeComment(rawCommand);
+    this._currentRawCommand = rawCommand.trim();
 
     if (rawCommand.trim().length && !rawCommand.trim().startsWith("#")) {
       if (rawCommand.trim().startsWith("*")) {

package/src/storage/index.ts

@@ -4,7 +4,7 @@ import { HZEngineCore, Platform } from "../index.js";
 import Path from "../utils/path.js";
 // import { isFileSync } from "./fs.js";
 
-export class Storage{
+export class Storage {
   constructor(private _core: HZEngineCore) {}
 
   projectRoot: string | null = null;
@@ -354,53 +354,55 @@ export class Storage{
     if (!this._core.platform.readdirSync({ path: scriptDir }))
       throw "项目文件夹中script文件夹不存在";
 
-
-        /**
+    /**
      * 1. 预加载所有的label并检查冲突
      * 2. 记录所有脚本文件的行数
      */
-        const preloadHzs = (path: string) => {
-          // let fd = this._core.platform.openSync({ path });
-          // if (fd < 0) throw "Fd<0";
-          // let size = this._core.platform.statSync({ path })!.size;
-          // let arrbuf = new ArrayBuffer(size);
-          // this._core.platform.readSync({ fd, buffer: arrbuf });
-          // let buffer = Buffer.from(arrbuf);
-          // let contentStr = buffer.toString();
-          let contentStr = this._core.platform.readFileSync({ path, options: { encoding: "utf8" }}) as string;
-          let contentLines = contentStr.split("\n");
-          let totalLines = contentLines.length;
-          hzsInfoMap[path] = { totalLines };
-          for (let i = 0; i < totalLines; ++i) {
-            let line = contentLines[i].trim();
-            if (line.startsWith("*")) {
-              let len = line.length,
-                p = 1,
-                q;
-              while (p < len && line.charAt(p) === " ") ++p;
-              if (p === len)
-                throw `Lost Label Name at file(${path}) line(${i + 1})`;
-              q = p;
-              while (q < len && line.charAt(q) !== " ") ++q;
-              // [p, q)
-              let label = line.slice(p, q);
-    
-              if (labelMap[label]) {
-                throw `Label name "${label}" conflict : \
+    const preloadHzs = (path: string) => {
+      // let fd = this._core.platform.openSync({ path });
+      // if (fd < 0) throw "Fd<0";
+      // let size = this._core.platform.statSync({ path })!.size;
+      // let arrbuf = new ArrayBuffer(size);
+      // this._core.platform.readSync({ fd, buffer: arrbuf });
+      // let buffer = Buffer.from(arrbuf);
+      // let contentStr = buffer.toString();
+      let contentStr = this._core.platform.readFileSync({
+        path,
+        options: { encoding: "utf8" },
+      }) as string;
+      let contentLines = contentStr.split("\n");
+      let totalLines = contentLines.length;
+      hzsInfoMap[path] = { totalLines };
+      for (let i = 0; i < totalLines; ++i) {
+        let line = contentLines[i].trim();
+        if (line.startsWith("*")) {
+          let len = line.length,
+            p = 1,
+            q;
+          while (p < len && line.charAt(p) === " ") ++p;
+          if (p === len)
+            throw `Lost Label Name at file(${path}) line(${i + 1})`;
+          q = p;
+          while (q < len && line.charAt(q) !== " ") ++q;
+          // [p, q)
+          let label = line.slice(p, q);
+
+          if (labelMap[label]) {
+            throw `Label name "${label}" conflict : \
     at [${labelMap[label][0]}(line ${labelMap[label][1]})] \
     [${path}(line ${i + 1})]`;
-              }
-    
-              labelMap[label] = [path, i];
-            }
           }
+
+          labelMap[label] = [path, i];
         }
+      }
+    };
 
     // 遍历所有hzs文件
     const traverseScript = (path: string) => {
       let dirs = this._core.platform.readdirSync({ path });
       // console.log(dirs);
-      
+
       for (let dir of dirs!) {
         let subpath = Path.join(path, dir);
         if (this._core.platform.isFileSync({ path: subpath })) {
@@ -413,10 +415,8 @@ export class Storage{
           traverseScript(subpath);
         }
       }
-    }
+    };
     traverseScript(scriptDir);
-
-
   }
   /**
    * 预加载资源
@@ -448,7 +448,7 @@ export class Storage{
     const traverseImage = (path: string) => {
       let dirs = this._core.platform.readdirSync({ path });
       // console.log(dirs);
-      
+
       for (let dir of dirs!) {
         let subpath = Path.join(path, dir);
         if (this._core.platform.isFileSync({ path: subpath })) {
@@ -461,10 +461,9 @@ export class Storage{
           traverseImage(subpath);
         }
       }
-    }
+    };
     traverseImage(imageDir);
 
-
     // console.log(
     //   `Preloaded image: ${JSON.stringify(this.preloadedData.image.nameMap)}`
     // );
@@ -479,10 +478,12 @@ export class Storage{
       this.preloadedData.animation.profileMap;
 
     let animationDir = Path.join(this.projectRoot!, "animation");
-    if (!this._core.platform.readdirSync({ path: animationDir }))
-      throw "项目文件夹中animation文件夹不存在";
+    if (!this._core.platform.readdirSync({ path: animationDir })) {
+      // throw "项目文件夹中animation文件夹不存在";
+      console.log("Warning: 项目文件夹中animation文件夹不存在");
+      return; // allow project without animation folder
+    }
 
-    
     function preloadAnimation(path: string) {
       let raw_name = Path.parse(path).name;
       let name_key = raw_name.trim().replace(/ +/, "_");
@@ -506,9 +507,8 @@ export class Storage{
           traverseAnimation(subpath);
         }
       }
-    }
+    };
     traverseAnimation(animationDir);
-    
   }
   // Decorator Field
   // _archiveStateSetterRegisteredList: Set<string> = new Set();

package/tsconfig.json

@@ -11,7 +11,7 @@
     // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
 
     /* Language and Environment */
-    "target": "ES6",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+    "target": "ES2022",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
     // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
     // "jsx": "preserve",                                /* Specify what JSX code is generated. */
     // "experimentalDecorators": true,                   /* Enable experimental support for legacy experimental decorators. */

package/types/platform/index.d.ts

@@ -1,134 +1,137 @@
-export interface Platform<WidgetFactory = any> {
-    name: string;
-    getScreenSize(): [width: number, height: number];
-    createUILayer({ z_index }: {
-        z_index: number;
-    }): WidgetFactory;
-    deleteUILayer(widgetFactory: WidgetFactory): void;
-    isFileSync({ path }: {
-        path: string;
-    }): boolean;
-    readdirSync(option: Platform.readdirSync.Option): Platform.readdirSync.Result;
-    statSync(option: Platform.statSync.Option): Platform.statSync.Result;
-    readFileSync(option: Platform.readFileSync.Option): Platform.readFileSync.Result;
-    writeFileSync(option: Platform.writeFileSync.Option): void;
-    getImageInfo(img_path: string): {
-        width: number;
-        height: number;
-    };
-    getTime(): number;
-    createAudioPlayer(): Platform.AudioPlayer;
-    releaseAudioPlayer(audio_player: Platform.AudioPlayer): void;
-    setFrameInterval(callback: () => void): void;
-}
-export declare namespace Platform {
-    interface AudioPlayer {
-        onPrepared?: (success: boolean) => void | undefined;
-        onCompleted?: () => void | undefined;
-        prepare(): void;
-        start(): void;
-        stop(): void;
-        release(): void;
-        getMediaInfo(): MediaInfo;
-        setSource({ path }: {
-            path: string;
-        }): void;
-    }
-    interface MediaInfo {
-        title: string | undefined;
-        artist: string | undefined;
-        duration: number;
-    }
-    namespace readdirSync {
-        interface Option {
-            /**
-             * @zh 目录路径
-             * @en Directory path
-             */
-            path: string;
-        }
-        /**
-         * @zh 如果返回 `undefined` 则目录不存在，否则返回文件名数组
-         * @en If `undefined` is returned, the directory does not exist, otherwise an array of filenames is returned
-         */
-        type Result = Array<string> | undefined;
-    }
-    namespace statSync {
-        interface Option {
-            /**
-             * @zh 路径
-             * @en path
-             */
-            path: string;
-        }
-        /**
-         * @zh 如果返回 `undefined` 则目标文件不存在，否则返回文件信息对象
-         * @en If `undefined` is returned, the target file does not exist, otherwise the file information object is returned
-         */
-        type Result = FSStat | undefined;
-        /**
-         * @output
-         */
-        interface FSStat {
-            /**
-             * @zh 文件大小（单位为字节）
-             * @en The size of the file in bytes
-             */
-            size: number;
-        }
-    }
-    namespace readFileSync {
-        interface Option {
-            /**
-             * @zh 文件路径
-             * @en path
-             */
-            path: string;
-            /**
-             * @zh 其他选项
-             * @en Other Options
-             */
-            options?: Options;
-        }
-        interface Options {
-            /**
-             * @zh 当指定了编码方式之后，API 返回结果为 `string`
-             * @en When the encoding method is specified, the API returns `string` as the result
-             */
-            encoding?: string;
-        }
-        /**
-         * @zh 文件内容。如果返回 `undefined`，则表明读取文件失败
-         * @en File content. If `undefined` is returned, the file failed to be read
-         */
-        type Result = ArrayBuffer | string | undefined;
-    }
-    namespace writeFileSync {
-        interface Option {
-            /**
-             * @zh 文件路径或者文件句柄
-             * @en File path or file descriptor
-             */
-            path: string | number;
-            /**
-             * @zh 写入目标文件的数据
-             * @en Data to be written to the target file
-             */
-            data: ArrayBuffer | string | DataView;
-            /**
-             * @zh 其他选项
-             * @en Other Options
-             */
-            options?: Options;
-        }
-        interface Options {
-            /**
-             * @zh 如果数据格式为 `string`，需要指定编码方式
-             * @en If the `data` format is `string`, you need to specify the encoding method
-             * @defaultValue utf8
-             */
-            encoding?: string;
-        }
-    }
-}
-export default Platform;
+export interface Platform<WidgetFactory = any> {
+    name: string;
+    getScreenSize(): [width: number, height: number];
+    createUILayer({ z_index }: {
+        z_index: number;
+    }): WidgetFactory;
+    deleteUILayer(widgetFactory: WidgetFactory): void;
+    isFileSync({ path }: {
+        path: string;
+    }): boolean;
+    readdirSync(option: Platform.readdirSync.Option): Platform.readdirSync.Result;
+    statSync(option: Platform.statSync.Option): Platform.statSync.Result;
+    readFileSync(option: Platform.readFileSync.Option): Platform.readFileSync.Result;
+    writeFileSync(option: Platform.writeFileSync.Option): void;
+    getImageInfo(img_path: string): {
+        width: number;
+        height: number;
+    } | Promise<{
+        width: number;
+        height: number;
+    }>;
+    getTime(): number;
+    createAudioPlayer(): Platform.AudioPlayer;
+    releaseAudioPlayer(audio_player: Platform.AudioPlayer): void;
+    setFrameInterval(callback: () => void): void;
+}
+export declare namespace Platform {
+    interface AudioPlayer {
+        onPrepared?: (success: boolean) => void | undefined;
+        onCompleted?: () => void | undefined;
+        prepare(): void;
+        start(): void;
+        stop(): void;
+        release(): void;
+        getMediaInfo(): MediaInfo;
+        setSource({ path }: {
+            path: string;
+        }): void;
+    }
+    interface MediaInfo {
+        title: string | undefined;
+        artist: string | undefined;
+        duration: number;
+    }
+    namespace readdirSync {
+        interface Option {
+            /**
+             * @zh 目录路径
+             * @en Directory path
+             */
+            path: string;
+        }
+        /**
+         * @zh 如果返回 `undefined` 则目录不存在，否则返回文件名数组
+         * @en If `undefined` is returned, the directory does not exist, otherwise an array of filenames is returned
+         */
+        type Result = Array<string> | undefined;
+    }
+    namespace statSync {
+        interface Option {
+            /**
+             * @zh 路径
+             * @en path
+             */
+            path: string;
+        }
+        /**
+         * @zh 如果返回 `undefined` 则目标文件不存在，否则返回文件信息对象
+         * @en If `undefined` is returned, the target file does not exist, otherwise the file information object is returned
+         */
+        type Result = FSStat | undefined;
+        /**
+         * @output
+         */
+        interface FSStat {
+            /**
+             * @zh 文件大小（单位为字节）
+             * @en The size of the file in bytes
+             */
+            size: number;
+        }
+    }
+    namespace readFileSync {
+        interface Option {
+            /**
+             * @zh 文件路径
+             * @en path
+             */
+            path: string;
+            /**
+             * @zh 其他选项
+             * @en Other Options
+             */
+            options?: Options;
+        }
+        interface Options {
+            /**
+             * @zh 当指定了编码方式之后，API 返回结果为 `string`
+             * @en When the encoding method is specified, the API returns `string` as the result
+             */
+            encoding?: string;
+        }
+        /**
+         * @zh 文件内容。如果返回 `undefined`，则表明读取文件失败
+         * @en File content. If `undefined` is returned, the file failed to be read
+         */
+        type Result = ArrayBuffer | string | undefined;
+    }
+    namespace writeFileSync {
+        interface Option {
+            /**
+             * @zh 文件路径或者文件句柄
+             * @en File path or file descriptor
+             */
+            path: string | number;
+            /**
+             * @zh 写入目标文件的数据
+             * @en Data to be written to the target file
+             */
+            data: ArrayBuffer | string | DataView;
+            /**
+             * @zh 其他选项
+             * @en Other Options
+             */
+            options?: Options;
+        }
+        interface Options {
+            /**
+             * @zh 如果数据格式为 `string`，需要指定编码方式
+             * @en If the `data` format is `string`, you need to specify the encoding method
+             * @defaultValue utf8
+             */
+            encoding?: string;
+        }
+    }
+}
+export default Platform;