transone-cli 0.4.0 → 0.6.0

package/README.md

@@ -87,15 +87,17 @@ export default defineConfig({
     directoryPages: false,
   },
   mp: {
-    appId: 'touristappid',         // WeChat dev-tool test id by default
+    host: 'https://api.example.com', // default request baseURL
     navigationBarTitleText: 'TransOne',
     lengthUnit: 'px',              // or 'rpx' (values converted at 1px = 2rpx)
     // pages, window, tabBar, appExtra, pageExtra, globalData, publicDir ...
+    'mp-weixin': { appId: 'wx123456' },
+    'mp-alipay': { appId: '2024000000000000', navigationBarTitleText: 'Alipay' },
   },
 });
 ```
 
-The `mp` field accepts either a single `MiniProgramConfig` (applies to every mini-program target) or a per-platform map like `{ 'mp-weixin': {...}, 'mp-alipay': {...}, 'mp-xiaohongshu': {...} }` — only the config for the current target is used. Xiaohongshu uses the default placeholder app ID unless you set its own `appId`.
+Common mini-program fields live directly under `mp`; platform-specific fields live under keys such as `'mp-weixin'` or `'mp-alipay'`. The current platform overrides common fields: objects merge recursively, arrays replace as a whole, and undefined fields inherit common values. Platforms without overrides use the common configuration. Existing flat and platform-only configurations remain supported. The default app ID is `touristappid` unless configured.
 
 Generate the Counter playground project for Xiaohongshu with:
 
@@ -146,3 +148,27 @@ bun run lint
 ## License
 
 MIT
+
+### API host for mini-programs and native apps
+
+Set `mp.host` or `app.host` in `transone.config.ts` (an absolute HTTP/HTTPS URL).
+`mp['mp-weixin'].host` and `app['app-ios'].host` override their common host.
+For mini-programs, `transone/request` uses this host as its default `baseURL`;
+instance and per-request `baseURL` take priority, and absolute request URLs keep their own address.
+With no host configured, request behavior remains unchanged.
+
+```ts
+export default defineConfig({
+  mp: {
+    host: 'https://api.example.com',
+    'mp-weixin': { host: 'https://wx-api.example.com' },
+  },
+  app: {
+    host: 'https://api.example.com',
+    'app-ios': { host: 'https://ios-api.example.com' },
+  },
+});
+```
+
+Native app builds write `{ host }` to `transone.config.json` in the platform resource directory.
+Native request compilation is not yet supported; this file is configuration for future integration.

package/dist/{build-mp-6j38wf4r.js → build-mp-004pd4h0.js}

@@ -7,6 +7,7 @@ import"./index-yb2wsc7f.js";
 // src/mp/build-mp.ts
 import { cp, mkdir, readdir, rm, writeFile } from "fs/promises";
 import { existsSync as existsSync2 } from "fs";
+import { fileURLToPath } from "url";
 import { basename, dirname as dirname3, join as join3, relative, resolve as resolve2 } from "path";
 
 // src/mp/analyze.ts
@@ -2268,6 +2269,13 @@ function visit(context, classSource, node, state) {
     }
   }
   if (ts.isIdentifier(node) && !state.locals.has(node.text) && state.consts.has(node.text)) {
+    const initializer = state.consts.get(node.text);
+    if (ts.isCallExpression(initializer) && ts.isIdentifier(initializer.expression)) {
+      const factoryName = initializer.expression.text;
+      const isRequestFactory = classSource.source.statements.some((statement) => ts.isImportDeclaration(statement) && ts.isStringLiteral(statement.moduleSpecifier) && statement.moduleSpecifier.text === "transone/request" && statement.importClause?.namedBindings && ts.isNamedImports(statement.importClause.namedBindings) && statement.importClause.namedBindings.elements.some((item) => item.name.text === factoryName && (item.propertyName?.text ?? item.name.text) === "createRequest"));
+      if (isRequestFactory)
+        return node;
+    }
     const folded = foldExpression(ts, state.consts.get(node.text), state.consts);
     if (folded === undefined) {
       throw mpError(classSource.filePath, `\u65B9\u6CD5\u4E2D\u5F15\u7528\u4E86\u65E0\u6CD5\u9759\u6001\u6C42\u503C\u7684\u6A21\u5757\u5E38\u91CF "${node.text}"`);
@@ -2475,10 +2483,34 @@ function isComponentFile(context, filePath) {
 function compileInlineModule(context, source) {
   const { ts } = context;
   const kept = [];
+  const requestImports = [];
   for (const statement of source.statements) {
+    if (ts.isImportDeclaration(statement) && ts.isStringLiteral(statement.moduleSpecifier) && statement.moduleSpecifier.text === "transone/request" && !statement.importClause?.isTypeOnly) {
+      const clause = statement.importClause;
+      if (clause?.name)
+        requestImports.push(`const ${clause.name.text} = getApp().__transoneRequest.default;`);
+      const bindings = clause?.namedBindings;
+      if (bindings && ts.isNamespaceImport(bindings)) {
+        requestImports.push(`const ${bindings.name.text} = getApp().__transoneRequest;`);
+      } else if (bindings && ts.isNamedImports(bindings)) {
+        for (const item of bindings.elements) {
+          if (!item.isTypeOnly)
+            requestImports.push(`const ${item.name.text} = getApp().__transoneRequest[${JSON.stringify(item.propertyName?.text ?? item.name.text)}];`);
+        }
+      }
+    }
     if (ts.isImportDeclaration(statement) || ts.isExportDeclaration(statement) || ts.isExportAssignment(statement) || ts.isInterfaceDeclaration(statement) || ts.isTypeAliasDeclaration(statement)) {
       continue;
     }
+    if (ts.isClassDeclaration(statement) && statement.heritageClauses?.some((clause) => clause.types.some((type) => ts.isIdentifier(type.expression) && (type.expression.text === "Component" || type.expression.text.endsWith("Component")))))
+      continue;
+    if (ts.isVariableStatement(statement)) {
+      const declarations = statement.declarationList.declarations.filter((declaration) => !(declaration.initializer && ts.isCallExpression(declaration.initializer) && ts.isIdentifier(declaration.initializer.expression) && declaration.initializer.expression.text === "createApp"));
+      if (declarations.length === 0)
+        continue;
+      kept.push(ts.factory.updateVariableStatement(statement, statement.modifiers, ts.factory.updateVariableDeclarationList(statement.declarationList, declarations)));
+      continue;
+    }
     kept.push(statement);
   }
   const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
@@ -2490,7 +2522,8 @@ function compileInlineModule(context, source) {
     },
     reportDiagnostics: false
   });
-  return transpiled.outputText.replace(/^export\s+/gm, "").trim();
+  return [...requestImports, transpiled.outputText.replace(/^export\s+/gm, "").trim()].join(`
+`);
 }
 
 // src/mp/compile.ts
@@ -2706,7 +2739,20 @@ async function buildMiniProgram(config, dialect) {
     ...dialect.appJsonExtras()
   }, null, 2)}
 `);
-  await write("app.js", `App(${JSON.stringify(mp.globalData !== undefined ? { globalData: mp.globalData } : {})});
+  const requestBundle = await Bun.build({
+    entrypoints: [fileURLToPath(import.meta.resolve("transone/request"))],
+    target: "browser",
+    format: "cjs",
+    minify: false
+  });
+  if (!requestBundle.success)
+    throw new Error(`Mini program request runtime build failed: ${requestBundle.logs.join(`
+`)}`);
+  await write("transone-request.js", await requestBundle.outputs[0].text());
+  await write("app.js", `App({__transoneRequest: require('./transone-request.js'), ...${JSON.stringify({
+    ...mp.host !== undefined ? { __transoneConfig: { host: mp.host } } : {},
+    ...mp.globalData !== undefined ? { globalData: mp.globalData } : {}
+  })}});
 `);
   if (dialect.sitemap) {
     await write("sitemap.json", `${JSON.stringify({
@@ -2796,5 +2842,5 @@ export {
   buildMiniProgram
 };
 
-//# debugId=B563DD7B11FB4E5E64756E2164756E21
-//# sourceMappingURL=build-mp-6j38wf4r.js.map
+//# debugId=E75D11FB4BE62D3864756E2164756E21
+//# sourceMappingURL=build-mp-004pd4h0.js.map