My feauture compon

package.json

@@ -156,8 +156,8 @@
     "stylelint-order": "^6.0.4",
     "ts-jest": "^29.1.2",
     "ts-node": "^10.9.1",
-    "typescript": "~5.4.5",
     "tslib": "^2.6.2",
+    "typescript": "~5.4.5",
     "vitest": "^1.6.0"
   },
   "pnpm": {

packages/shared/src/constants.ts

@@ -1,5 +1,6 @@
 export enum PLATFORM_TYPE {
   MINI = 'mini',
+  ASCF = 'ascf',
   WEB = 'web',
   RN = 'rn',
   HARMONY = 'harmony',
@@ -17,6 +18,9 @@ export const PLATFORM_CONFIG_MAP = {
   harmony: {
     type: PLATFORM_TYPE.HARMONY
   },
+  ascf: {
+    type: PLATFORM_TYPE.ASCF
+  },
   mini: {
     type: PLATFORM_TYPE.MINI
   },

packages/taro-api/src/ascf-bridge.ts

@@ -0,0 +1,64 @@
+import * as ASCF from '@ascf/native-api'
+
+import Taro from '../../../../../taroo/taro/packages/taro/types'
+import networkMappings from './ascf-mappings/network.json'
+
+
+const transformers = {
+  normalizeHeaders: (headers: Record<string, any>) => {
+    const normalized: Record<string, any> = {}
+    Object.keys(headers).forEach(key => {
+      normalized[key.toLowerCase()] = headers[key]
+    })
+    return normalized
+  }
+}
+
+export function ascRequest(options: Taro.request.Option): Promise<Taro.request.SuccessCallbackResult> {
+  const mapping = networkMappings.request
+  const ascfParams: Record<string, any> = {}
+
+
+  Object.entries(mapping).forEach(([taroKey, config]) => {
+    const value = (options as any)[taroKey]
+
+    if (value === undefined) {
+      if (config.required) {
+        throw new Error(`[ASCF] Missing required parameter: ${taroKey}`)
+      }
+      if (config.default !== undefined) {
+        ascfParams[config.ascfParam] = config.default
+      }
+      return
+    }
+
+    let transformedValue = value
+    if (config.valueMap) {
+      transformedValue = config.valueMap[value] ?? value
+    }
+    if (config.transform && transformers[config.transform]) {
+      transformedValue = transformers[config.transform](value)
+    }
+
+    ascfParams[config.ascfParam] = transformedValue
+  })
+
+  return ASCF.Network.request(ascfParams).then(res => {
+    return {
+      data: res.body,
+      statusCode: res.status,
+      header: res.headers,
+      errMsg: 'request:ok'
+    }
+  })
+}
+
+
+export const ascfApis = {
+  connectDevice: (options: { deviceId: string, timeout?: number }) => {
+    return ASCF.Device.connect({
+      deviceId: options.deviceId,
+      timeout: options.timeout || 5000
+    })
+  }
+}

packages/taro-api/src/ascf-mappings/network.json

@@ -0,0 +1,27 @@
+{
+  "request": {
+    "url": {
+      "ascfParam": "endpoint",
+      "type": "string",
+      "required": true,
+      "docLink": "https://ascf.docs/apis/network#endpoint"
+    },
+    "method": {
+      "ascfParam": "httpMethod",
+      "valueMap": {
+        "GET": "GET",
+        "POST": "POST",
+        "PUT": "PUT",
+        "DELETE": "DELETE"
+      },
+      "default": "GET",
+      "docLink": "https://ascf.docs/apis/network#http-method"
+    },
+    "header": {
+      "ascfParam": "headers",
+      "type": "object",
+      "transform": "normalizeHeaders",
+      "docLink": "https://ascf.docs/apis/network#headers"
+    }
+  }
+}

packages/taro-api/src/env.ts

@@ -1,4 +1,5 @@
 export const ENV_TYPE = {
+  ASCF: 'ASCF',
   WEAPP: 'WEAPP',
   SWAN: 'SWAN',
   ALIPAY: 'ALIPAY',
@@ -35,6 +36,8 @@ export function getEnv () {
     return ENV_TYPE.HARMONY
   } else if (process.env.TARO_ENV === 'quickapp') {
     return ENV_TYPE.QUICKAPP
+  } else if (process.env.TARO_ENV === 'ascf') {
+    return ENV_TYPE.ASCF
   } else {
     return process.env.TARO_ENV || 'Unknown'
   }

packages/taro-cli/src/cli.ts

@@ -118,6 +118,7 @@ export default class CLI {
           // 针对不同的内置平台注册对应的端平台插件
           switch (platform) {
             case 'weapp':
+            case 'ascf':
             case 'alipay':
             case 'swan':
             case 'tt':

packages/taro-cli/src/presets/platforms/plugin.ts

@@ -16,15 +16,16 @@ export default (ctx: IPluginContext) => {
         _
       } = ctx.runOpts
       const { chalk, PLATFORMS } = ctx.helper
-      const { WEAPP, ALIPAY, JD } = PLATFORMS
+      const { ASCF, WEAPP, ALIPAY, JD } = PLATFORMS
       const typeMap = {
+        [ASCF]: 'ASCF',
         [JD]: '京东',
         [WEAPP]: '微信',
         [ALIPAY]: '支付宝'
       }
       const { plugin, isWatch } = options
-      if (plugin !== WEAPP && plugin !== ALIPAY && plugin !== JD) {
-        console.log(chalk.red('目前插件编译仅支持 微信/支付宝/京东 小程序！'))
+      if (plugin !== ASCF && plugin !== WEAPP && plugin !== ALIPAY && plugin !== JD) {
+        console.log(chalk.red('目前插件编译仅支持 ASCF/微信/支付宝/京东 小程序！'))
         return
       }
       console.log(chalk.green(`开始编译${typeMap[plugin]}小程序插件`))

packages/taro-components/ascf-mappings/core.json

@@ -0,0 +1,32 @@
+{
+  "Button": {
+    "size": {
+      "ascfProp": "dimension",
+      "valueMap": {
+        "mini": "XS",
+        "small": "S",
+        "default": "M",
+        "large": "L"
+      },
+      "required": false,
+      "default": "M",
+      "docLink": "https://ascf.docs/components/button#dimension"
+    },
+    "loading": {
+      "ascfProp": "isLoading",
+      "type": "boolean",
+      "required": false,
+      "default": false,
+      "docLink": "https://ascf.docs/components/button#isloading"
+    }
+  },
+  "Input": {
+    "password": {
+      "ascfProp": "secretInput",
+      "type": "boolean",
+      "required": false,
+      "default": false,
+      "docLink": "https://ascf.docs/components/input#secretinput"
+    }
+  }
+}

packages/taro-components/src/common/ascf-adapter.tsx

@@ -0,0 +1,43 @@
+import { h } from '@stencil/core'
+import React from 'react'
+
+import coreMappings from '../../ascf-mappings/core.json'
+
+const ASCF_MAPPINGS = {
+  ...coreMappings
+}
+
+export function withAscfAdapter<T extends IntrinsicAttributes & T>(WrappedComponent: React.ComponentType<T>) {
+  const componentName = WrappedComponent.name
+  const mapping = ASCF_MAPPINGS[componentName] || {}
+
+  // eslint-disable-next-line react/display-name
+  return (props: T) => {
+    if (process.env.TARO_ENV !== 'ascf') {
+      return <WrappedComponent {...props} />
+    }
+
+    const ascfProps: any = {}
+
+    Object.entries(props).forEach(([key, value]) => {
+      const propMapping = mapping[key]
+
+      if (propMapping) {
+        ascfProps[propMapping.ascfProp] = propMapping.valueMap
+          ? propMapping.valueMap[value] ?? value
+          : value
+      } else {
+        ascfProps[key] = value
+      }
+    })
+
+    Object.entries(mapping).forEach(([, config]) => {
+      const ascfKey = config.ascfProp
+      if (ascfProps[ascfKey] === undefined && config.default !== undefined) {
+        ascfProps[ascfKey] = config.default
+      }
+    })
+
+    return <WrappedComponent {...ascfProps} />
+  }
+}

packages/taro-components/src/components/button/button.tsx

@@ -1,5 +1,7 @@
 import { Component, h, Prop, State, ComponentInterface, Event, EventEmitter, Listen, Element, Host } from '@stencil/core'
 import classNames from 'classnames'
+import { withAscfAdapter } from 'src/common/ascf-adapter'
+
 
 @Component({
   tag: 'taro-button-core',
@@ -104,3 +106,6 @@ export class Button implements ComponentInterface {
     )
   }
 }
+
+
+

packages/taro-components/types/Button.d.ts

@@ -440,6 +440,33 @@ declare namespace ButtonProps {
       authorizePrivateMessage
     }
   }
+
+  declare namespace TaroGeneral {
+    interface ENV_TYPE {
+      ascf: boolean
+    }
+  }  
+
+  type ASCFAdaptedProps<Props, Mapping> = {
+    [K in keyof Props]:
+      K extends keyof Mapping
+        ? Mapping[K]['ascfProp'] extends string
+          ? Props[K]
+          : never
+        : Props[K]
+  } & {
+    [K in keyof Mapping as Mapping[K]['ascfProp']]?: any
+  };
+  interface ButtonProps {
+    size?: 'mini' | 'small' | 'default' | 'large'
+    loading?: boolean
+  }
+
+  type TaroButtonProps = 
+    TaroGeneral.ENV_TYPE['ascf'] extends true 
+      ? ASCFAdaptedProps<ButtonProps, typeof coreMappings.Button>
+      : ButtonProps;
+
   /** lang 的合法值 */
   interface Lang {
     /** 英文 */

packages/taro-helper/src/constants.ts

@@ -103,7 +103,7 @@ export const REG_IMAGE = /\.(png|jpe?g|gif|bpm|svg|webp)(\?.*)?$/
 export const REG_FONT = /\.(woff2?|eot|ttf|otf)(\?.*)?$/
 export const REG_JSON = /\.json(\?.*)?$/
 export const REG_UX = /\.ux(\?.*)?$/
-export const REG_TEMPLATE = /\.(wxml|axml|ttml|qml|swan|jxml)(\?.*)?$/
+export const REG_TEMPLATE = /\.(hxml|wxml|axml|ttml|qml|swan|jxml)(\?.*)?$/
 export const REG_WXML_IMPORT = /<import(.*)?src=(?:(?:'([^']*)')|(?:"([^"]*)"))/gi
 export const REG_URL =
   /^(?:(?:(?:https?|ftp):)?\/\/)(?:\S+(?::\S*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z0-9\u00a1-\uffff][a-z0-9\u00a1-\uffff_-]{0,62})?[a-z0-9\u00a1-\uffff]\.)+(?:[a-z\u00a1-\uffff]{2,}\.?))(?::\d{2,5})?(?:[/?#]\S*)?$/i
@@ -177,6 +177,7 @@ export const UPDATE_PACKAGE_LIST = [
   '@tarojs/taroize',
   '@tarojs/plugin-inject',
   '@tarojs/plugin-platform-weapp',
+  '@tarojs/plugin-platform-ascf',
   '@tarojs/plugin-platform-alipay',
   '@tarojs/plugin-platform-swan',
   '@tarojs/plugin-platform-tt',

packages/taro-platform-ascf/README.md

@@ -0,0 +1,3 @@
+# `@tarojs/plugin-platform-ascf`
+
+Taro 插件。用于支持编译为ascf。

packages/taro-platform-ascf/index.js

@@ -0,0 +1,4 @@
+module.exports = require('./dist/index.js').default
+
+module.exports.default = module.exports
+module.exports.AscfApp = require('./dist/index.js').AscfApp

packages/taro-platform-ascf/package.json

@@ -0,0 +1,40 @@
+{
+  "name": "@tarojs/plugin-platform-ascf",
+  "version": "4.0.12",
+  "description": "ascf平台插件",
+  "author": "ascf",
+  "license": "MIT",
+  "main": "index.js",
+  "types": "dist/types/index.d.ts",
+  "keywords": [
+    "taro"
+  ],
+  "files": [
+    "index.js",
+    "dist"
+  ],
+  "scripts": {
+    "prod": "pnpm run build",
+    "build": "rollup -c",
+    "dev": "rollup -c -w"
+  },
+  "bugs": {
+    "url": "https://github.com/NervJS/taro/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/NervJS/taro.git"
+  },
+  "engines": {
+    "node": ">= 18"
+  },
+  "devDependencies": {
+    "@tarojs/components": "workspace:*",
+    "@tarojs/service": "workspace:*",
+    "@tarojs/shared": "workspace:*"
+  },
+  "peerDependencies": {
+    "@tarojs/service": "workspace:*",
+    "@tarojs/shared": "workspace:*"
+  }
+}