glyphix 1.0.30 → 1.0.32

package/bin/glyphix.js

@@ -136,7 +136,6 @@ var import_fs_extra2 = require("fs-extra");
 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"));
 var import_lodash = require("lodash");
 function loadEnv() {
@@ -164,65 +163,6 @@ function loadEnv() {
     import_dotenv.default.config({ path: dotenvFile });
   });
 }
-function getOriginFilePath(filePath, rootPath) {
-  const relativePath = (0, import_node_path3.relative)(rootPath, filePath);
-  const projectRoot = process.cwd();
-  const originPath = (0, import_node_path3.resolve)(projectRoot, "src", relativePath);
-  if (originPath.endsWith(".ts")) {
-    const uxOrigin = originPath.slice(0, -3) + ".ux";
-    if ((0, import_node_fs.existsSync)(uxOrigin)) {
-      return uxOrigin;
-    }
-  }
-  return originPath;
-}
-function outErrorLog(results, filepath) {
-  results.messages.forEach((item) => {
-    console.log(
-      `${filepath}:${item.line}:${item.column}`,
-      "\n	",
-      import_chalk2.default.red("error"),
-      "	",
-      item.message,
-      "	",
-      import_chalk2.default.gray(item.ruleId)
-    );
-  });
-}
-function lintFile(rootPath) {
-  const distPath = (0, import_node_path3.join)(rootPath, ".vite-dist");
-  if ((0, import_node_fs.existsSync)(distPath)) {
-    (0, import_fs_extra2.removeSync)(distPath);
-  }
-  const sources = (0, import_glob.sync)([
-    `${(0, import_node_path3.resolve)(rootPath)}/**/*.ts`,
-    `${(0, import_node_path3.resolve)(rootPath)}/**/*.js`
-  ]);
-  const eslint = new import_eslint.ESLint({
-    warnIgnored: true,
-    overrideConfig: {
-      rules: {
-        "no-console": "off",
-        "prettier/prettier": "off",
-        "@typescript-eslint/ban-ts-comment": "warn",
-        "@typescript-eslint/no-explicit-any": "off",
-        "@typescript-eslint/no-unused-vars": "warn",
-        quotes: "off"
-      }
-    }
-  });
-  return eslint.lintFiles(sources).then((res) => {
-    return res.filter((item) => item.errorCount).map((item) => {
-      return item;
-    }).flat();
-  }).then((res) => {
-    res.forEach((item) => {
-      const originPath = getOriginFilePath(item.filePath, rootPath);
-      outErrorLog(item, originPath);
-    });
-    return res;
-  });
-}
 function dealResource() {
   if (!process.env["VITE_BUILD_DIR"])
     throw Error("not set glyphix project path");
@@ -314,12 +254,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);
-    }
-    build(config.root, config.entry);
-  });
+  build(config.root, config.entry);
 }
 
 // src/cli/index.ts

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "glyphix",
-	"version": "1.0.30",
+	"version": "1.0.32",
 	"main": "lib/index.js",
 	"types": "types/index.d.ts",
 	"files": [

package/types/index.d.ts

@@ -17,43 +17,37 @@
 /// <reference path="./exchange.d.ts" />
 /// <reference path="./audiokit.d.ts" />
 
+
 declare global {
   function $t(key: string): string;
 }
 
-// 基础 Data 类型定义
-type Data<T extends Record<string, any> = Record<string, any>> = T;
 
-// 其他类型定义保持不变
-type ComputedResults<C, D extends Data> = {
+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 Computed<C, D extends Data> = {
+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
-    : any;
+    : never;
 };
-
-type Methods<M, D extends Data> = {
+type Methods<M, D> = {
   [K in keyof M]: K extends keyof D ? never : M[K];
 };
-
 type LifeCycleHooks = {
   onInit?: () => void;
   onReady?: () => void;
@@ -61,7 +55,6 @@ type LifeCycleHooks = {
   onHide?: () => void;
   onDestroy?: () => void;
 };
-
 type OmitedProps =
   | "data"
   | "computed"
@@ -70,7 +63,6 @@ type OmitedProps =
   | "onShow"
   | "onHide"
   | "onDestroy";
-
 type ComponentInternals = {
   $element(id: string): Record<string, any> | undefined;
   $valid: boolean;
@@ -79,31 +71,26 @@ type ComponentInternals = {
   $component(name: string, url: string): void;
   $emit(name: string, ...args: Array<any>);
 };
-
-type ComponentProps<D extends Data, C, M> = Omit<
+type ComponentProps<D, C, M> = Omit<
   D & ComputedResults<C, D> & M & ComponentInternals,
   OmitedProps
 >;
-
-// 修正 ComponentOptions 类型
 type ComponentOptions<
-  T extends Record<string, any>,
-  C = any,
-  W = any,
-  M = any
+  D extends Data,
+  C, // 先不深究 C 的 this 约束
+  W,
+  M
 > = {
-  data: T;
-  computed?: Computed<C, T>;
-  watch?: Watches<W, T>;
+  data: D;
+  computed?: Computed<C, D>;
+  watch?: Watches<W, D>;
 } & LifeCycleHooks &
-  Methods<M, T> &
-  ThisType<ComponentProps<T, Computed<C, T & Methods<M, T>>, M>>;
-
+  Methods<M, D> &
+  ThisType<ComponentProps<D, Computed<C, D & Methods<M, D>>, M>>;
 export declare function defineComponent<
-  T extends Record<string, any>,
-  C = any,
-  W = any,
-  M = any
->(options: ComponentOptions<T, C, W, M>): ComponentOptions<T, C, W, M>;
-
+  D extends Data,
+  C, // 计算属性可能依赖于 data 和 methods
+  W,
+  M
+>(options: ComponentOptions<D, C, W, M>): ComponentOptions<D, C, W, M>;
 export {};