glyphix 1.0.9 → 1.0.11

package/{glyphix.js → bin/glyphix.js}

@@ -23,10 +23,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// src/index.ts
+// src/cli/index.ts
 var import_yargs = __toESM(require("yargs"));
 
-// src/utils/logger.ts
+// src/cli/utils/logger.ts
 var import_chalk = __toESM(require("chalk"));
 var { log: originLog } = console;
 console.debug = function(...args) {
@@ -42,7 +42,7 @@ console.error = function(...args) {
   originLog(import_chalk.default.red(...args));
 };
 
-// src/command/new.ts
+// src/cli/command/new.ts
 var import_fs_extra = require("fs-extra");
 var import_child_process = require("child_process");
 var import_node_path = require("path");
@@ -75,7 +75,7 @@ function createProject(cwd, name) {
   (0, import_child_process.spawnSync)("git", ["init"], { cwd: targetFullPath });
 }
 
-// src/command/buildEmu.ts
+// src/cli/command/buildEmu.ts
 var import_child_process2 = require("child_process");
 var import_node_path2 = require("path");
 function reconstructArgs(argv) {
@@ -117,6 +117,9 @@ function buildGlyphix(args) {
   (_b = childProcess.stderr) == null ? void 0 : _b.on("data", (data) => {
     console.error(data);
   });
+  childProcess.on("error", (err) => {
+    console.error(err);
+  });
   childProcess.on("exit", () => {
     console.log("exit");
   });
@@ -125,7 +128,7 @@ function buildGlyphix(args) {
   });
 }
 
-// src/command/generate.ts
+// src/cli/command/generate.ts
 var import_esbuild = __toESM(require("esbuild"));
 var import_node_path3 = require("path");
 var import_node_fs = require("fs");
@@ -134,6 +137,32 @@ var import_eslint = require("eslint");
 var import_glob = require("glob");
 var import_chalk2 = __toESM(require("chalk"));
 var import_node_process = require("process");
+var import_dotenv = __toESM(require("dotenv"));
+function loadEnv() {
+  const dotenvTags = [
+    // 本地环境
+    "development",
+    // 测试环境
+    // 比如：单元测试
+    "test",
+    // 部署环境
+    // 比如：日常、预发、线上
+    "production"
+  ];
+  if (!dotenvTags.includes(process.env.GLYPHIX_ENV ?? "")) {
+    process.env.GLYPHIX_ENV = dotenvTags[0];
+  }
+  const dotenvPath = (0, import_node_path3.resolve)(".env");
+  const dotenvFiles = [
+    dotenvPath,
+    `${dotenvPath}.local`,
+    `${dotenvPath}.${process.env.GLYPHIX_ENV}`,
+    `${dotenvPath}.${process.env.GLYPHIX_ENV}.local`
+  ].filter(import_node_fs.existsSync);
+  dotenvFiles.reverse().forEach((dotenvFile) => {
+    import_dotenv.default.config({ path: dotenvFile });
+  });
+}
 function getOriginFilePath(filePath, rootPath) {
   const relativePath = (0, import_node_path3.relative)(rootPath, filePath);
   const projectRoot = process.cwd();
@@ -195,15 +224,6 @@ function dealResource() {
   const entries = entryFileContent.entry;
   (0, import_fs_extra2.removeSync)((0, import_node_path3.resolve)(rootPath, ".vite-dist"));
   let entriedFullPath = entries.map((item) => (0, import_node_path3.resolve)(rootPath, item));
-  entriedFullPath = entriedFullPath.map((item) => {
-    if ((0, import_node_fs.existsSync)(item)) {
-      const dest = item.replace(".js", ".ts");
-      if ((0, import_node_fs.existsSync)(dest)) (0, import_fs_extra2.removeSync)(dest);
-      (0, import_fs_extra2.moveSync)(item, dest);
-      return dest;
-    }
-    return item;
-  });
   return {
     root: rootPath,
     entry: entriedFullPath
@@ -211,6 +231,11 @@ function dealResource() {
 }
 function build(rootPath, entriedFullPath) {
   const resolveExtensions = [".ts", ".js"];
+  let envDefine = {};
+  Array.from(Object.keys(process.env)).forEach((key) => {
+    if (key.startsWith("GLYPHIX"))
+      envDefine[`process.env.${key}`] = JSON.stringify(process.env[key]);
+  });
   import_esbuild.default.build({
     entryPoints: entriedFullPath,
     // 入口文件
@@ -228,6 +253,7 @@ function build(rootPath, entriedFullPath) {
     platform: "node",
     target: "node14",
     // 目标平台设置为最新 ECMAScript
+    define: envDefine,
     minify: process.env.GLYPHIX_ENV === "development" ? false : true,
     plugins: [
       {
@@ -265,6 +291,7 @@ function build(rootPath, entriedFullPath) {
 }
 function generateGlyphix() {
   const config = dealResource();
+  loadEnv();
   lintFile(config.root).then((res) => {
     if (res.length) {
       (0, import_node_process.exit)(1);
@@ -273,26 +300,59 @@ function generateGlyphix() {
   });
 }
 
-// src/index.ts
-import_yargs.default.option("create", { describe: "create a new project" }).command("create", "create a glyphix project", {}, (args) => {
+// src/cli/index.ts
+import_yargs.default.command("create", "create a glyphix project", {}, (args) => {
   console.debug("create project", __dirname);
   if (args._.length < 2) {
     console.error("miss project name");
     return;
   }
   createProject(process.cwd(), args._[1] + "");
-}).command("generate", "compiler glyphix project", {}, generateGlyphix).command("build", "build glyphix project", {}, buildGlyphix).command(
-  "emu",
-  "run emulator",
+}).command("generate", "compiler glyphix project", {}, generateGlyphix).command(
+  "build",
+  "build glyphix project",
   (yargs2) => {
-    return yargs2.positional("glyphix emu [OPTIONS]", {
-      describe: "213",
-      type: "string"
-    }).options("device", {
-      alias: "d",
+    return yargs2.options("device", {
+      describe: "The name of the device to use when building.\nThereafter, emulation and packaging will use this\nconfiguration.",
+      type: "string",
+      alias: "d"
+    }).options("emulator", {
+      describe: "Build packages for the emulator, not the target device",
+      type: "boolean",
+      alias: "e"
+    }).options("image-rules", {
+      describe: "Use the specified image rules description file\n(default is config/image-rules.json).",
+      type: "string",
+      alias: "r"
+    }).options("full", {
+      describe: "Rebuild all the files for the project.",
       type: "string",
-      description: "The name of the device to use when building, \n emulation and packaging"
+      alias: "f"
+    }).options("dump", {
+      describe: "Dump details of the build process to aid debugging.",
+      type: "boolean"
     }).help().argv;
   },
   buildGlyphix
-).help().alias("help", "h").argv;
+).command("emu", "run emulator", (yargs2) => {
+  return yargs2.options("device", {
+    describe: "The name of the device to use when building,\nemulation and packaging.",
+    type: "string",
+    alias: "d",
+    demandOption: false
+  }).options("emulator-exe", {
+    describe: "Path to the glyphix-emu executable",
+    type: "string",
+    alias: "e",
+    normalize: true,
+    demandOption: false
+  }).options("language", {
+    describe: "Set the system language name. The default value is zh-CN.",
+    type: "string",
+    alias: "l"
+  }).options("inspector", {
+    describe: "Scale the window size to real device screen.",
+    type: "string",
+    alias: "l"
+  }).help().argv;
+}).help().alias("help", "h").argv;

package/libs/index.js

@@ -0,0 +1 @@
+function o(e){return e}export{o as defineComponent};

package/package.json

@@ -1,24 +1,35 @@
 {
 	"name": "glyphix",
-	"version": "1.0.9",
+	"version": "1.0.11",
 	"main": "lib/index.js",
 	"types": "types/index.d.ts",
 	"files": [
 		"glyphix.js",
 		"types/",
 		"template/",
-		"script/"
+		"script/",
+		"libs/"
 	],
 	"scripts": {
 		"postinstall": "node ./script/install.js"
 	},
 	"bin": {
-		"glyphix": "./glyphix.js"
+		"glyphix": "./bin/glyphix.js"
+	},
+	"exports": {
+		".": {
+			"import": {
+				"types": "./types/index.d.ts",
+				"default": "./libs/index.js"
+			}
+		}
 	},
 	"dependencies": {
 		"adm-zip": "^0.5.16",
 		"chalk": "^4.1.2",
+		"dotenv": "^16.4.7",
 		"esbuild": "^0.24.2",
+		"esbuild-plugin-d.ts": "^1.3.1",
 		"eslint": "^9.18.0",
 		"fs-extra": "^11.2.0",
 		"glob": "^11.0.1",

package/types/file.d.ts

@@ -25,7 +25,7 @@ declare module "@system.file" {
 
     rename(params: { oldUri: string; newUri: string }): Promise<void>;
 
-    list(params: { uri: string }): Promise<Array>;
+    list(params: { uri: string }): Promise<Array<string>>;
 
     access(params: { uri: string }): Promise<boolean>;
 

package/types/index.d.ts

@@ -9,3 +9,63 @@
 /// <reference path="./network.d.ts" />
 /// <reference path="./cipher.d.ts" />
 
+type ComputedResults<C, D> = {
+  readonly [K in keyof C as C[K] extends (this: D) => any
+    ? K
+    : never]: C[K] extends () => infer R ? R : never;
+} & {
+  [K in keyof C]: C[K] extends ComputedField<infer R> ? R : never;
+};
+type ComputedField<T> =
+  | {
+      get(): T;
+      set(x: T): void;
+    }
+  | (() => T);
+type Data = Record<string, any>;
+type Computed<C, D> = {
+  [K in keyof C]: K extends keyof D ? never : ComputedField<C[K]>;
+} & ThisType<D>;
+type Watches<W, D extends Data> = {
+  [K in keyof W]: K extends keyof D
+    ? ((newValue: D[K], oldValue: D[K]) => void) | undefined
+    : never;
+};
+type Methods<M, D> = {
+  [K in keyof M]: K extends keyof D ? never : M[K];
+};
+type LifeCycleHooks = {
+  onInit?: () => void;
+  onReady?: () => void;
+  onShow?: () => void;
+  onHide?: () => void;
+  onDestroy?: () => void;
+};
+type OmitedProps =
+  | "data"
+  | "computed"
+  | "onInit"
+  | "onReady"
+  | "onShow"
+  | "onHide"
+  | "onDestroy";
+type ComponentProps<D, C, M> = Omit<D & ComputedResults<C, D> & M, OmitedProps>;
+type ComponentOptions<
+  D extends Data,
+  C, // 先不深究 C 的 this 约束
+  W,
+  M
+> = {
+  data: D;
+  computed?: Computed<C, D>;
+  watch?: Watches<W, D>;
+} & LifeCycleHooks &
+  Methods<M, D> &
+  ThisType<ComponentProps<D, Computed<C, D & Methods<M, D>>, M>>;
+export declare function defineComponent<
+  D extends Data,
+  C, // 计算属性可能依赖于 data 和 methods
+  W,
+  M
+>(options: ComponentOptions<D, C, W, M>): ComponentOptions<D, C, W, M>;
+export {};

package/types/launch.d.ts

@@ -6,7 +6,7 @@ declare module "@system.launch" {
      * 返回的 Promise 表示应用是否加载成功
      * @param app 应用 id
      */
-    launch(app: string): Promise<bool>;
+    launch(app: string): Promise<Boolean>;
     /**
      * 将应用切换到后台
      * @param app 应用 id

package/types/media.d.ts

@@ -50,9 +50,9 @@ declare module "@system.media" {
       channel?: 1 | 2;
       success?: () => void;
       failed?: () => void;
-    });
+    }): void;
 
-    read(options: { callback: (buffer: ArrayBuffer) => void });
+    read(options: { callback: (buffer: ArrayBuffer) => void }): void;
 
     stop(): void;
     release(): void;

package/types/router.d.ts

@@ -1,4 +1,5 @@
 declare module "@system.router" {
+  interface Component {}
   interface RouterFactory {
     /**
      * 跳转到应用内的指定页面
@@ -58,7 +59,7 @@ declare module "@system.router" {
 
     /**
      * 获取页面栈中名为 name 的所有页面索引，页面索引值的顺序和页面栈的顺序相同
-     * @param name 
+     * @param name
      */
     queryIndex(name: string): number[];
   }

package/types/websocketfactory.d.ts

@@ -1,6 +1,9 @@
-declare module '@system.websocketfactory' {
+declare module "@system.websocketfactory" {
   interface WebSocketFactory {
-    create(options: { url: string; header: { [key: string]: any } });
+    create(options: {
+      url: string;
+      header: { [key: string]: any };
+    }): WebSocketInstance;
   }
 
   export interface WebSocketInstance {