@galacean/cli 2.0.0-alpha.7 → 2.0.0-alpha.9

package/dist/cli.bundle.cjs

@@ -88499,7 +88499,7 @@ var init_scene_parser = __esm({
 });
 
 // src/domain-bridge/load.ts
-async function readLocalTextAsset(projectDir, entryPath, _entryUrl, label) {
+async function readLocalTextAsset(projectDir, entryPath, label) {
   try {
     return await import_promises8.default.readFile(`${projectDir}/${entryPath}`, "utf-8");
   } catch (error49) {
@@ -88588,19 +88588,19 @@ async function loadDomainState(projectDir) {
           throw new Error(`[domain-bridge] failed to parse scene file ${entry2.path}: ${errorMessage(error49)}`);
         }
       } else if (entry2.type === "script") {
-        const text2 = await readLocalTextAsset(projectDir, entry2.path, entry2.url, "script");
+        const text2 = await readLocalTextAsset(projectDir, entry2.path, "script");
         if (text2 !== null)
           assetState.content = { code: text2 };
       } else if (entry2.type === "Prefab") {
-        const text2 = await readLocalTextAsset(projectDir, entry2.path, entry2.url, "prefab");
+        const text2 = await readLocalTextAsset(projectDir, entry2.path, "prefab");
         if (text2 !== null)
           assetState.content = parseJsonWithPath(text2, entry2.path);
       } else if (entry2.type === "Shader" || entry2.type === "ShaderChunk") {
-        const text2 = await readLocalTextAsset(projectDir, entry2.path, entry2.url, entry2.type.toLowerCase());
+        const text2 = await readLocalTextAsset(projectDir, entry2.path, entry2.type.toLowerCase());
         if (text2 !== null)
           assetState.content = { source: text2 };
       } else if (entry2.type === "Material") {
-        const text2 = await readLocalTextAsset(projectDir, entry2.path, entry2.url, "material");
+        const text2 = await readLocalTextAsset(projectDir, entry2.path, "material");
         if (text2 !== null) {
           const matData = parseJsonWithPath(text2, entry2.path);
           const props = extractMaterialProps(matData);
@@ -109470,7 +109470,7 @@ var init_schema10 = __esm({
       textureType: textureTypeEnum.optional().default("Texture").describe("\u7EB9\u7406\u7C7B\u578B\uFF0C\u9ED8\u8BA4 Texture2D"),
       folderId: external_exports.string().optional().describe("\u76EE\u6807\u6587\u4EF6\u5939 ID\uFF0C\u7701\u7565\u5219\u521B\u5EFA\u5728\u6839\u76EE\u5F55"),
       // 纹理来源（三选一）
-      url: external_exports.string().url().optional().describe("\u7EB9\u7406 URL \u5730\u5740"),
+      url: external_exports.string().min(1).optional().describe("\u7EB9\u7406 URL \u6216\u672C\u5730\u6587\u4EF6\u8DEF\u5F84"),
       base64: external_exports.string().max(FILE_SIZE_LIMITS.MAX_BASE64_STRING_LENGTH).optional().describe(`Base64 \u7F16\u7801\u7684\u56FE\u7247\u6570\u636E\uFF08\u6700\u5927 ${FILE_SIZE_LIMITS.MAX_BASE64_IMAGE_SIZE / 1024 / 1024}MB\uFF09`),
       // 纹理设置
       filterMode: textureFilterModeEnum.optional().describe("\u8FC7\u6EE4\u6A21\u5F0F"),
@@ -109630,12 +109630,42 @@ var init_upload_helpers = __esm({
 });
 
 // ../editor-api/src/tools/asset/texture/create.ts
-async function fetchImageBlob(url2) {
-  validateImageUrl(url2);
+function isUrl(input) {
+  return /^https?:\/\/|^data:/i.test(input);
+}
+async function fetchImageBlob(urlOrPath) {
+  if (!isUrl(urlOrPath)) {
+    const { readFile: readFile5 } = await import("node:fs/promises");
+    const { resolve: resolve5, extname: extname4 } = await import("node:path");
+    const resolved = resolve5(urlOrPath);
+    let buf;
+    try {
+      buf = await readFile5(resolved);
+    } catch (e5) {
+      throw new EditorAPIError("OPERATION_FAILED", `\u65E0\u6CD5\u8BFB\u53D6\u672C\u5730\u56FE\u7247: ${resolved} (${e5.code || e5.message})`);
+    }
+    const ext = extname4(resolved).toLowerCase();
+    const mimeMap = {
+      ".png": "image/png",
+      ".jpg": "image/jpeg",
+      ".jpeg": "image/jpeg",
+      ".webp": "image/webp",
+      ".gif": "image/gif",
+      ".svg": "image/svg+xml",
+      ".hdr": "image/vnd.radiance"
+    };
+    const mime = mimeMap[ext];
+    if (!mime) {
+      throw new EditorAPIError("INVALID_PARAMETER", `\u4E0D\u652F\u6301\u7684\u56FE\u7247\u683C\u5F0F: ${ext}`);
+    }
+    const ab = buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.byteLength);
+    return new Blob([ab], { type: mime });
+  }
+  validateImageUrl(urlOrPath);
   const controller = new AbortController();
   const timeoutId = setTimeout(() => controller.abort(), NETWORK_SETTINGS.DEFAULT_TIMEOUT);
   try {
-    const response = await fetch(url2, {
+    const response = await fetch(urlOrPath, {
       signal: controller.signal,
       redirect: "error"
       // 禁止跟随重定向到不安全的地址
@@ -211135,9 +211165,6 @@ var init_en2 = __esm({
         lottie: {
           title: "Lottie"
         },
-        texture: {
-          title: "Texture"
-        },
         "spine-skeleton-data": {
           title: "Spine Skeleton Data"
         },
@@ -214559,9 +214586,6 @@ var init_zh = __esm({
         lottie: {
           title: "Lottie"
         },
-        texture: {
-          title: "\u7EB9\u7406"
-        },
         "spine-skeleton-data": {
           title: "Spine\u9AA8\u9ABC\u6570\u636E"
         },
@@ -217996,9 +218020,6 @@ var init_ja2 = __esm({
         lottie: {
           title: "Lottie"
         },
-        texture: {
-          title: "\u30C6\u30AF\u30B9\u30C1\u30E3"
-        },
         "spine-skeleton-data": {
           title: "Spine\u30B9\u30B1\u30EB\u30C8\u30F3\u30C7\u30FC\u30BF"
         },
@@ -323046,6 +323067,8 @@ var init_HeadlessAssetProxy = __esm({
       }
       async ensureReady() {
       }
+      async collectDependencies() {
+      }
       async flushPendingSave() {
       }
       /**
@@ -323121,11 +323144,12 @@ var init_HeadlessAssetProxy = __esm({
                 scale: { ...e5.transform.scale }
               }
             },
-            components: Object.entries(e5.components).map(([id, c5]) => ({
-              id,
-              class: c5.type,
-              props: { ...c5.props }
-            })),
+            components: Object.entries(e5.components).map(([id, c5]) => {
+              const comp = { id, class: c5.type, props: { ...c5.props } };
+              if (c5.methods && Object.keys(c5.methods).length > 0)
+                comp.methods = { ...c5.methods };
+              return comp;
+            }),
             ...overrides
           };
         };
@@ -334620,6 +334644,27 @@ async function createContainerFolder(packageName, assetFacade) {
   }
   return folder.id;
 }
+function isUrl2(input) {
+  return /^https?:\/\/|^data:/i.test(input);
+}
+async function readGrpZip(urlOrPath) {
+  if (isUrl2(urlOrPath)) {
+    const response = await fetch(urlOrPath);
+    if (!response.ok) {
+      throw new EditorAPIError("OPERATION_FAILED", `Failed to fetch GRP: ${response.status} ${response.statusText}`);
+    }
+    return response.arrayBuffer();
+  }
+  const { readFile: readFile5 } = await import("node:fs/promises");
+  const { resolve: resolve5 } = await import("node:path");
+  const resolved = resolve5(urlOrPath);
+  try {
+    const buf = await readFile5(resolved);
+    return buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.byteLength);
+  } catch (e5) {
+    throw new EditorAPIError("OPERATION_FAILED", `Failed to read local GRP file: ${resolved} (${e5.code || e5.message})`);
+  }
+}
 var import_jszip, manifestSchema, grpImportInputSchema, grpImportOutputSchema, grpImport;
 var init_import = __esm({
   "../editor-api/src/tools/grp/import.ts"() {
@@ -334666,7 +334711,7 @@ var init_import = __esm({
       }).optional()
     });
     grpImportInputSchema = external_exports.object({
-      url: external_exports.string().url().describe("GRP \u5305\u7684 CDN URL")
+      source: external_exports.string().min(1).describe("GRP \u5305\u7684 URL \u6216\u672C\u5730\u6587\u4EF6\u8DEF\u5F84")
     });
     grpImportOutputSchema = external_exports.object({
       success: external_exports.boolean(),
@@ -334682,13 +334727,9 @@ var init_import = __esm({
       output: grpImportOutputSchema,
       handler: async (params, ctx) => {
         const { assetFacade, assetStore } = ctx;
-        const { url: url2 } = params;
+        const { source } = params;
         try {
-          const response = await fetch(url2);
-          if (!response.ok) {
-            throw new EditorAPIError("OPERATION_FAILED", `Failed to fetch GRP: ${response.status} ${response.statusText}`);
-          }
-          const zipData = await response.arrayBuffer();
+          const zipData = await readGrpZip(source);
           const zip = await import_jszip.default.loadAsync(zipData);
           const manifestFile = zip.file("manifest.json");
           if (!manifestFile) {
@@ -334703,7 +334744,7 @@ var init_import = __esm({
             );
           }
           const manifest = parseResult.data;
-          const packageName = extractPackageName(url2);
+          const packageName = extractPackageName(source);
           const containerFolderId = await createContainerFolder(packageName, assetFacade);
           const isCdnMode = manifest.mode === "cdn";
           const files = /* @__PURE__ */ new Map();
@@ -340668,7 +340709,9 @@ async function maybeAutoPush(opts, cmd, saved) {
   if (!saved || opts.dryRun)
     return;
   const globals = cmd.optsWithGlobals();
-  const shouldPush = opts.push ?? globals._config?.autoPush !== "false";
+  const env = process.env.GALACEAN_AUTOPUSH;
+  const envAutoPush = env === "false" || env === "0" ? false : env === "true" || env === "1" ? true : void 0;
+  const shouldPush = opts.push ?? envAutoPush ?? globals._config?.autoPush === "true";
   if (!shouldPush)
     return;
   await autoPushProject(import_node_path15.default.resolve(opts.project), globals);
@@ -352736,7 +352779,7 @@ function readCliVersionFromPackageJson() {
   const parsed = JSON.parse(raw);
   return typeof parsed.version === "string" && parsed.version.length > 0 ? parsed.version : "0.0.0";
 }
-var CLI_VERSION = "2.0.0-alpha.7".length > 0 ? "2.0.0-alpha.7" : readCliVersionFromPackageJson();
+var CLI_VERSION = "2.0.0-alpha.9".length > 0 ? "2.0.0-alpha.9" : readCliVersionFromPackageJson();
 
 // src/cli.ts
 init_config();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/cli",
-  "version": "2.0.0-alpha.7",
+  "version": "2.0.0-alpha.9",
   "main": "dist/cli.bundle.cjs",
   "bin": {
     "galacean": "bin/galacean.js"