transone-cli 0.4.0 → 0.6.0

package/dist/cli.js

@@ -5,7 +5,7 @@ import {
   createProject,
   isTargetType,
   startDevServer
-} from "./index-m455xjw2.js";
+} from "./index-pg5v7h1t.js";
 import"./index-k1qfvp0y.js";
 import"./index-yb2wsc7f.js";
 

package/dist/create.d.ts

@@ -11,6 +11,6 @@ export interface CreateProjectResult {
 /** Published framework version referenced by generated projects. */
 export declare const TRANSONE_FRAMEWORK_VERSION = "0.4.0";
 /** Published CLI version referenced by generated projects. */
-export declare const TRANSONE_CLI_VERSION = "0.4.0";
+export declare const TRANSONE_CLI_VERSION = "0.6.0";
 export declare const GITHUB_URL = "https://github.com/geektech-team/transone";
 export declare function createProject(options?: CreateProjectOptions): CreateProjectResult;

package/dist/{index-m455xjw2.js → index-pg5v7h1t.js}

@@ -118,12 +118,16 @@ function pickAppConfig(app, target) {
     return;
   }
   if (isAppConfigMap(app)) {
-    return isAppTargetType(target) ? app[target] : undefined;
+    return {
+      ...app.host !== undefined ? { host: app.host } : {},
+      ...isAppTargetType(target) ? app[target] : {}
+    };
   }
   return app;
 }
 async function resolveApp(root, outDirOverride, app, target, fallbackPages) {
   return {
+    ...app.host !== undefined ? { host: app.host } : {},
     appName: app.appName ?? "TransOne",
     bundleId: app.bundleId ?? "com.transone.app",
     outDir: resolve(root, outDirOverride ?? app.outDir ?? `dist/build/${target}`),
@@ -141,20 +145,33 @@ var MP_DEFAULT_OUT_DIRS = {
   "mp-bytedance": "dist/build/mp-bytedance",
   "mp-xiaohongshu": "dist/build/mp-xiaohongshu"
 };
-function isMpConfigMap(value) {
-  return isRecord(value) && MP_TARGET_TYPES.some((platform) => (platform in value));
-}
 function pickMpConfig(mp, target) {
   if (mp === undefined) {
     return;
   }
-  if (isMpConfigMap(mp)) {
-    return isMpTargetType(target) ? mp[target] : undefined;
+  const common = Object.fromEntries(Object.entries(mp).filter(([key]) => !MP_TARGET_TYPES.includes(key)));
+  const platform = isMpTargetType(target) ? mp[target] : undefined;
+  return mergeMpRecords(common, { ...platform });
+}
+function mergeMpRecords(common, overrides) {
+  const merged = { ...common };
+  for (const [key, value] of Object.entries(overrides)) {
+    if (value === undefined)
+      continue;
+    const previous = Object.prototype.hasOwnProperty.call(common, key) ? common[key] : undefined;
+    const next = isRecord(previous) && isRecord(value) ? mergeMpRecords(previous, value) : value;
+    Object.defineProperty(merged, key, {
+      value: next,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
   }
-  return mp;
+  return merged;
 }
 function resolveMiniProgram(root, outDirOverride, mp, pages, target) {
   return {
+    ...mp.host !== undefined ? { host: mp.host } : {},
     appId: mp.appId ?? "touristappid",
     outDir: resolve(root, outDirOverride ?? mp.outDir ?? (MP_DEFAULT_OUT_DIRS[target] ?? "dist/build/mp-weixin")),
     navigationBarTitleText: mp.navigationBarTitleText ?? "TransOne",
@@ -303,6 +320,7 @@ function validateUserConfig(config) {
 }
 function validateAppConfig(app) {
   assertRecord(app, "Config app");
+  validateApiHost(app.host, "Config app.host");
   if (isAppConfigMap(app)) {
     const flatKeys = ["appName", "bundleId", "outDir", "minPlatformVersion", "publicDir", "pages"];
     if (flatKeys.some((key) => (key in app))) {
@@ -319,6 +337,7 @@ function validateAppConfig(app) {
 }
 function validateSingleAppConfig(app, label) {
   assertRecord(app, label);
+  validateApiHost(app.host, `${label}.host`);
   for (const key of ["appName", "bundleId", "outDir", "minPlatformVersion", "publicDir"]) {
     if (app[key] !== undefined && typeof app[key] !== "string") {
       throw new Error(`${label}.${key} must be a string`);
@@ -330,19 +349,16 @@ function validateSingleAppConfig(app, label) {
 }
 function validateMpConfig(mp) {
   assertRecord(mp, "Config mp");
-  if (isMpConfigMap(mp)) {
-    for (const platform of MP_TARGET_TYPES) {
-      const platformConfig = mp[platform];
-      if (platformConfig !== undefined) {
-        validateMiniProgramConfig(platformConfig, `Config mp.${platform}`);
-      }
+  validateMiniProgramConfig(mp, "Config mp");
+  for (const platform of MP_TARGET_TYPES) {
+    if (mp[platform] !== undefined) {
+      validateMiniProgramConfig(mp[platform], `Config mp.${platform}`);
     }
-    return;
   }
-  validateMiniProgramConfig(mp, "Config mp");
 }
 function validateMiniProgramConfig(mp, label) {
   assertRecord(mp, label);
+  validateApiHost(mp.host, `${label}.host`);
   for (const key of ["appId", "outDir", "navigationBarTitleText", "publicDir"]) {
     if (mp[key] !== undefined && typeof mp[key] !== "string") {
       throw new Error(`${label}.${key} must be a string`);
@@ -468,6 +484,18 @@ function assertRecord(value, name) {
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value) && (Object.getPrototypeOf(value) === Object.prototype || Object.getPrototypeOf(value) === null);
 }
+function validateApiHost(host, label) {
+  if (host === undefined)
+    return;
+  if (typeof host !== "string")
+    throw new Error(`${label} must be a string`);
+  try {
+    const url = new URL(host);
+    if (url.protocol === "http:" || url.protocol === "https:")
+      return;
+  } catch {}
+  throw new Error(`${label} must use http or https`);
+}
 
 // src/target/web-target.ts
 import { mkdir, rm, writeFile } from "fs/promises";
@@ -825,7 +853,7 @@ class MpTarget {
     if (!config.mp) {
       throw new Error("Mini program build requires config.mp\uFF08\u8BF7\u5728 transone.config.ts \u914D\u7F6E mp \u5B57\u6BB5\uFF0C" + "\u5982 appId / pages / outDir\uFF09");
     }
-    const { buildMiniProgram } = await import("./build-mp-6j38wf4r.js");
+    const { buildMiniProgram } = await import("./build-mp-004pd4h0.js");
     return buildMiniProgram(config, this.dialect);
   }
 }
@@ -1011,6 +1039,10 @@ async function buildNativeApp(config, dialect) {
     throw nativeError(config.entry, "\u9996\u671F\u539F\u751F App \u53EA\u652F\u6301\u4E00\u4E2A\u9875\u9762");
   const screen = await analyzeNativeScreen(entries[0]);
   const files = dialect.generateProject(screen, config.app);
+  if (config.app.host !== undefined) {
+    files[`${dialect.resourceDirectory}/transone.config.json`] = `${JSON.stringify({ host: config.app.host }, null, 2)}
+`;
+  }
   await rm2(config.app.outDir, { recursive: true, force: true });
   const assetsBuilt = [];
   for (const [relative3, content] of Object.entries(files).sort(([a], [b]) => a.localeCompare(b))) {
@@ -1336,7 +1368,7 @@ async function runTsc(root, tsconfig) {
 import { existsSync as existsSync4, mkdirSync, writeFileSync } from "fs";
 import { basename as basename2, join as join2 } from "path";
 var TRANSONE_FRAMEWORK_VERSION = "0.4.0";
-var TRANSONE_CLI_VERSION = "0.4.0";
+var TRANSONE_CLI_VERSION = "0.6.0";
 var GITHUB_URL = "https://github.com/geektech-team/transone";
 function createProject(options = {}) {
   const root = options.root ?? process.cwd();
@@ -2169,5 +2201,5 @@ function buildFailureResponse() {
 
 export { TARGET_TYPES, isTargetType, MP_TARGET_TYPES, isMpTargetType, defineConfig, resolveConfig, WebTarget, MpTarget, mpWeixinTarget, mpAlipayTarget, mpBytedanceTarget, mpXiaohongshuTarget, TargetRegistry, targetRegistry, build, createProject, startDevServer };
 
-//# debugId=4621705A1E76309564756E2164756E21
-//# sourceMappingURL=index-m455xjw2.js.map
+//# debugId=635285A08AF2FAAB64756E2164756E21
+//# sourceMappingURL=index-pg5v7h1t.js.map