Merge branch 'main' into feat/document_native_view

Tencent · Dec 25, 2023 · b128470 · b128470
2 parents db99bf4 + e9198be
commit b128470
Show file tree

Hide file tree

Showing 105 changed files with 2,440 additions and 4,867 deletions.
diff --git a/driver/js/packages/hippy-vue-css-loader/package.json b/driver/js/packages/hippy-vue-css-loader/package.json
@@ -20,6 +20,7 @@
     "loader-utils": "^1.4.1"
   },
   "devDependencies": {
+    "@types/loader-utils": "^2.0.6",
     "ansi-regex": "^5.0.1",
     "hosted-git-info": "~3.0.8",
     "lodash": "~4.17.21",

diff --git a/...loader/src/__tests__/color-parser.test.js → ...loader/src/__tests__/color-parser.test.ts b/...loader/src/__tests__/color-parser.test.js → ...loader/src/__tests__/color-parser.test.ts
diff --git a/.../hippy-vue-css-loader/src/color-parser.js → .../hippy-vue-css-loader/src/color-parser.ts b/.../hippy-vue-css-loader/src/color-parser.js → .../hippy-vue-css-loader/src/color-parser.ts
@@ -19,8 +19,11 @@
  */
 
 /* eslint-disable no-mixed-operators */
+type NameMapType = {
+  [key: string]: number;
+};
 
-export const names = {
+export const names: NameMapType  = {
   transparent: 0x00000000,
   aliceblue: 0xf0f8ffff,
   antiquewhite: 0xfaebd7ff,
@@ -173,7 +176,7 @@ export const names = {
   yellowgreen: 0x9acd32ff,
 };
 
-const call = (...args) => `\\(\\s*(${args.join(')\\s*,\\s*(')})\\s*\\)`;
+const call = (...args: any[]) => `\\(\\s*(${args.join(')\\s*,\\s*(')})\\s*\\)`;
 
 const NUMBER = '[-+]?\\d*\\.?\\d+';
 const PERCENTAGE = `${NUMBER}%`;
@@ -189,7 +192,7 @@ const matchers = {
   hex8: /^#([0-9a-fA-F]{8})$/,
 };
 
-const parse255 = (str) => {
+const parse255 = (str: string) => {
   const int = parseInt(str, 10);
   if (int < 0) {
     return 0;
@@ -200,7 +203,7 @@ const parse255 = (str) => {
   return int;
 };
 
-const parse1 = (str) => {
+const parse1 = (str: string) => {
   const num = parseFloat(str);
   if (num < 0) {
     return 0;
@@ -211,7 +214,7 @@ const parse1 = (str) => {
   return Math.round(num * 255);
 };
 
-const hue2rgb = (p, q, tx) => {
+const hue2rgb = (p: number, q: number, tx: number) => {
   let t = tx;
   if (t < 0) {
     t += 1;
@@ -231,7 +234,7 @@ const hue2rgb = (p, q, tx) => {
   return p;
 };
 
-const hslToRgb = (h, s, l) => {
+const hslToRgb = (h: number, s: number, l: number) => {
   const q = l < 0.5 ? l * (1 + s) : l + s - l * s;
   const p = 2 * l - q;
   const r = hue2rgb(p, q, h + 1 / 3);
@@ -244,13 +247,13 @@ const hslToRgb = (h, s, l) => {
   );
 };
 
-const parse360 = (str) => {
+const parse360 = (str: string) => {
   const int = parseFloat(str);
   return (((int % 360) + 360) % 360) / 360;
 };
 
-const parsePercentage = (str) => {
-  const int = parseFloat(str, 10);
+const parsePercentage = (str: string) => {
+  const int = parseFloat(str);
   if (int < 0) {
     return 0;
   }
@@ -260,7 +263,7 @@ const parsePercentage = (str) => {
   return int / 100;
 };
 
-function baseColor(color) {
+function baseColor(color: number | string) {
   let match;
   if (typeof color === 'number') {
     if (color >>> 0 === color && color >= 0 && color <= 0xffffffff) {
@@ -345,7 +348,7 @@ function baseColor(color) {
 /**
  * Translate the color to make sure native understood.
  */
-function translateColor(color) {
+function translateColor(color: string | number) {
   if (typeof color === 'string' && color.indexOf('var(') !== -1) return color;
   let int32Color = baseColor(color);
   if (int32Color === null) {

diff --git a/...es/hippy-vue-css-loader/src/css-loader.js → ...es/hippy-vue-css-loader/src/css-loader.ts b/...es/hippy-vue-css-loader/src/css-loader.js → ...es/hippy-vue-css-loader/src/css-loader.ts
@@ -29,7 +29,7 @@ let sourceId = 0;
 /**
  * Convert the CSS text to AST that able to parse by selector parser.
  */
-function hippyVueCSSLoader(source) {
+function hippyVueCSSLoader(this: any, source: any) {
   const options = getOptions(this);
   const parsed = parseCSS(source, { source: sourceId });
 
@@ -38,12 +38,13 @@ function hippyVueCSSLoader(source) {
   const hash = crypto.createHash(hashType);
   const contentHash = hash.update(source).digest('hex');
   sourceId += 1;
-  const rulesAst = parsed.stylesheet.rules.filter(n => n.type === 'rule').map(n => ({
+  const rulesAst = parsed.stylesheet.rules.filter((n: any) => n.type === 'rule').map((n: any) => ({
     hash: contentHash,
     selectors: n.selectors,
-    declarations: n.declarations.map((dec) => {
+
+    declarations: n.declarations.map((dec: any) => {
       let { value } = dec;
-      const isVariableColor = dec.property && dec.property.startsWith('-') && typeof value === 'string'
+      const isVariableColor = dec.property?.startsWith('-') && typeof value === 'string'
         && (
           value.includes('#')
           || value.includes('rgb')
@@ -52,7 +53,7 @@ function hippyVueCSSLoader(source) {
           || value.trim() in colorNames
         );
       if (dec.property && (dec.property.toLowerCase().indexOf('color') > -1 || isVariableColor)) {
-        value = translateColor(value, options);
+        value = translateColor(value);
       }
       return {
         type: dec.type,