@galacean/cli 0.0.1-alpha.1-alpha.1-alpha.1 → 0.0.1-alpha.3

package/dist/cli.bundle.cjs

@@ -3587,7 +3587,7 @@ var init_asset_path = __esm({
   }
 });
 
-// ../storage/src/path-tree.ts
+// ../storage/src/sync/integrity-validator.ts
 function isKnownAssetType(value) {
   return typeof value === "string" && KNOWN_ASSET_TYPES.has(value);
 }
@@ -3597,86 +3597,87 @@ function safeParseJsonObject(input) {
     if (value && typeof value === "object" && !Array.isArray(value))
       return value;
   } catch (error48) {
-    console.warn("[path-tree] Failed to parse asset meta:", error48);
+    console.warn("[integrity-validator] Failed to parse asset meta:", error48);
   }
   return {};
 }
-function buildLocalPathMap(assets) {
+function normalizeAssetType(kind, meta3) {
+  if (kind === "folder")
+    return "Folder";
+  if (!isKnownAssetType(meta3.type) || meta3.type === "Folder")
+    return "Unknown";
+  return meta3.type;
+}
+function validateRemoteAssets(assets) {
   const byUuid = /* @__PURE__ */ new Map();
-  for (const a of assets)
-    byUuid.set(a.uuid, a);
-  const resolved = /* @__PURE__ */ new Map();
+  for (const asset2 of assets) {
+    const kind = asset2.type === 1 ? "folder" : "file";
+    const meta3 = safeParseJsonObject(asset2.meta);
+    byUuid.set(asset2.uuid, {
+      asset: asset2,
+      kind,
+      assetType: normalizeAssetType(kind, meta3),
+      meta: meta3
+    });
+  }
   const visiting = /* @__PURE__ */ new Set();
-  const localPathToAssetId = /* @__PURE__ */ new Map();
-  const caseFoldLocalPathToAsset = /* @__PURE__ */ new Map();
-  function resolve4(uuid3) {
-    const cached2 = resolved.get(uuid3);
-    if (cached2)
-      return cached2.isFolder ? cached2.folderChain : [];
-    const asset2 = byUuid.get(uuid3);
-    if (!asset2)
-      return [];
+  const visited = /* @__PURE__ */ new Set();
+  function visit(uuid3) {
+    if (visited.has(uuid3))
+      return;
     if (visiting.has(uuid3)) {
       throw new Error(`Asset parentId cycle detected at '${uuid3}'`);
     }
+    const current = byUuid.get(uuid3);
+    if (!current)
+      return;
     visiting.add(uuid3);
-    const isFolder = asset2.type === 1;
-    assertValidAssetName(asset2.name);
-    const meta3 = safeParseJsonObject(asset2.meta);
-    const defaultMetaType = isFolder ? "Folder" : "Unknown";
-    const metaType = isKnownAssetType(meta3.type) ? meta3.type : defaultMetaType;
-    let parentChain = [];
-    if (asset2.parentId) {
-      if (!byUuid.has(asset2.parentId)) {
-        throw new Error(`Asset '${uuid3}' has unknown parentId '${asset2.parentId}' \u2014 data integrity violation`);
+    const parentId = current.asset.parentId;
+    if (parentId) {
+      const parent = byUuid.get(parentId);
+      if (!parent) {
+        throw new Error(`Asset '${uuid3}' has unknown parentId '${parentId}' \u2014 data integrity violation`);
       }
-      parentChain = resolve4(asset2.parentId);
-    }
-    const folderChain = isFolder ? [...parentChain, asset2.name] : parentChain;
-    const subdir = getAssetSubdirectory(metaType);
-    let localPath;
-    if (isFolder) {
-      localPath = subdir ? [subdir, ...folderChain].join("/") : folderChain.join("/");
-    } else {
-      const fileName = getLocalFileName(asset2.name, metaType);
-      const dirParts = subdir ? [subdir, ...parentChain] : [...parentChain];
-      localPath = [...dirParts, fileName].join("/");
-    }
-    const existingAssetId = localPathToAssetId.get(localPath);
-    if (existingAssetId && existingAssetId !== asset2.uuid) {
-      throw new Error(`Duplicate local path '${localPath}' for assets '${existingAssetId}' and '${asset2.uuid}'`);
+      if (parent.kind !== "folder") {
+        throw new Error(`Asset '${uuid3}' parentId '${parentId}' must reference a folder`);
+      }
+      visit(parentId);
     }
+    visiting.delete(uuid3);
+    visited.add(uuid3);
+  }
+  for (const asset2 of assets) {
+    visit(asset2.uuid);
+  }
+  return byUuid;
+}
+function createLocalPathRegistry() {
+  return {
+    exact: /* @__PURE__ */ new Map(),
+    caseFold: /* @__PURE__ */ new Map()
+  };
+}
+function registerLocalPathOrThrow(registry2, assetId, localPath, caseFold = true) {
+  const existingAssetId = registry2.exact.get(localPath);
+  if (existingAssetId && existingAssetId !== assetId) {
+    throw new Error(`Duplicate local path '${localPath}' for assets '${existingAssetId}' and '${assetId}'`);
+  }
+  if (caseFold) {
     const caseFoldLocalPath = localPath.toLowerCase();
-    const caseFoldExisting = caseFoldLocalPathToAsset.get(caseFoldLocalPath);
-    if (caseFoldExisting && caseFoldExisting.assetId !== asset2.uuid && caseFoldExisting.localPath !== localPath) {
+    const caseFoldExisting = registry2.caseFold.get(caseFoldLocalPath);
+    if (caseFoldExisting && caseFoldExisting.assetId !== assetId && caseFoldExisting.localPath !== localPath) {
       throw new Error(
-        `Case-only local path collision '${caseFoldExisting.localPath}' vs '${localPath}' for assets '${caseFoldExisting.assetId}' and '${asset2.uuid}'`
+        `Case-only local path collision '${caseFoldExisting.localPath}' vs '${localPath}' for assets '${caseFoldExisting.assetId}' and '${assetId}'`
       );
     }
-    localPathToAssetId.set(localPath, asset2.uuid);
-    caseFoldLocalPathToAsset.set(caseFoldLocalPath, { assetId: asset2.uuid, localPath });
-    resolved.set(uuid3, {
-      assetId: asset2.uuid,
-      serverId: asset2.id,
-      localPath,
-      metaType,
-      isFolder,
-      folderChain,
-      meta: meta3,
-      url: asset2.url ?? ""
-    });
-    visiting.delete(uuid3);
-    return folderChain;
+    registry2.caseFold.set(caseFoldLocalPath, { assetId, localPath });
   }
-  for (const a of assets)
-    resolve4(a.uuid);
-  return resolved;
+  registry2.exact.set(localPath, assetId);
 }
 var KNOWN_ASSET_TYPES;
-var init_path_tree = __esm({
-  "../storage/src/path-tree.ts"() {
+var init_integrity_validator = __esm({
+  "../storage/src/sync/integrity-validator.ts"() {
     "use strict";
-    init_asset_path();
     KNOWN_ASSET_TYPES = /* @__PURE__ */ new Set([
       "Folder",
       "Material",
@@ -3711,6 +3712,60 @@ var init_path_tree = __esm({
   }
 });
 
+// ../storage/src/path-tree.ts
+function buildLocalPathMap(assets) {
+  const validatedByUuid = validateRemoteAssets(assets);
+  const resolved = /* @__PURE__ */ new Map();
+  const localPathRegistry = createLocalPathRegistry();
+  function resolve4(uuid3) {
+    const cached2 = resolved.get(uuid3);
+    if (cached2)
+      return cached2.isFolder ? cached2.folderChain : [];
+    const validated = validatedByUuid.get(uuid3);
+    if (!validated)
+      return [];
+    const { asset: asset2, assetType: metaType, kind, meta: meta3 } = validated;
+    const isFolder = kind === "folder";
+    assertValidAssetName(asset2.name);
+    let parentChain = [];
+    if (asset2.parentId) {
+      parentChain = resolve4(asset2.parentId);
+    }
+    const folderChain = isFolder ? [...parentChain, asset2.name] : parentChain;
+    const subdir = getAssetSubdirectory(metaType);
+    let localPath;
+    if (isFolder) {
+      localPath = subdir ? [subdir, ...folderChain].join("/") : folderChain.join("/");
+    } else {
+      const fileName = getLocalFileName(asset2.name, metaType);
+      const dirParts = subdir ? [subdir, ...parentChain] : [...parentChain];
+      localPath = [...dirParts, fileName].join("/");
+    }
+    registerLocalPathOrThrow(localPathRegistry, asset2.uuid, localPath);
+    resolved.set(uuid3, {
+      assetId: asset2.uuid,
+      serverId: asset2.id,
+      localPath,
+      metaType,
+      isFolder,
+      folderChain,
+      meta: meta3,
+      url: asset2.url ?? ""
+    });
+    return folderChain;
+  }
+  for (const a of assets)
+    resolve4(a.uuid);
+  return resolved;
+}
+var init_path_tree = __esm({
+  "../storage/src/path-tree.ts"() {
+    "use strict";
+    init_asset_path();
+    init_integrity_validator();
+  }
+});
+
 // ../storage/src/manifest.ts
 function generateManifest(pathMap, contentHashes) {
   const entries = {};
@@ -3812,19 +3867,41 @@ var init_http = __esm({
   }
 });
 
-// ../storage/src/index.ts
-var init_src = __esm({
-  "../storage/src/index.ts"() {
+// ../storage/src/sync/project-codec.ts
+function assetNameFromPath(localPath, type) {
+  const parts = localPath.split("/");
+  const fileName = parts[parts.length - 1];
+  const ext = TYPE_EXTENSION[type];
+  if (ext && fileName.endsWith(ext)) {
+    return fileName.slice(0, -ext.length);
+  }
+  return fileName;
+}
+function findParentAssetId(localPath, entries) {
+  const parts = localPath.split("/");
+  if (parts.length <= 2)
+    return null;
+  const parentPath = parts.slice(0, -1).join("/");
+  for (const [assetId, entry] of Object.entries(entries)) {
+    if (entry.path === parentPath && entry.type === "Folder") {
+      return assetId;
+    }
+  }
+  return null;
+}
+var init_project_codec = __esm({
+  "../storage/src/sync/project-codec.ts"() {
     "use strict";
-    init_types();
     init_asset_path();
+  }
+});
+
+// ../storage/src/sync/desired-snapshot.ts
+var init_desired_snapshot = __esm({
+  "../storage/src/sync/desired-snapshot.ts"() {
+    "use strict";
     init_path_tree();
-    init_manifest();
-    init_meta_file();
-    init_fs();
-    init_project_writer();
-    init_interface();
-    init_http();
+    init_project_codec();
   }
 });
 
@@ -3843,6 +3920,83 @@ var init_hash = __esm({
   }
 });
 
+// ../storage/src/sync/executors/strong-fs-executor.ts
+var init_strong_fs_executor = __esm({
+  "../storage/src/sync/executors/strong-fs-executor.ts"() {
+    "use strict";
+    init_fs();
+    init_hash();
+    init_project_codec();
+  }
+});
+
+// ../storage/src/sync/executors/weak-fs-executor.ts
+var init_weak_fs_executor = __esm({
+  "../storage/src/sync/executors/weak-fs-executor.ts"() {
+    "use strict";
+    init_fs();
+    init_hash();
+    init_project_codec();
+  }
+});
+
+// ../storage/src/sync/mime-resolver.ts
+var init_mime_resolver = __esm({
+  "../storage/src/sync/mime-resolver.ts"() {
+    "use strict";
+  }
+});
+
+// ../storage/src/sync/planner.ts
+var init_planner = __esm({
+  "../storage/src/sync/planner.ts"() {
+    "use strict";
+  }
+});
+
+// ../storage/src/sync/snapshot-loader.ts
+var init_snapshot_loader = __esm({
+  "../storage/src/sync/snapshot-loader.ts"() {
+    "use strict";
+    init_meta_file();
+    init_project_codec();
+  }
+});
+
+// ../storage/src/sync-adapter.ts
+var init_sync_adapter = __esm({
+  "../storage/src/sync-adapter.ts"() {
+    "use strict";
+    init_fs();
+    init_meta_file();
+    init_desired_snapshot();
+    init_strong_fs_executor();
+    init_weak_fs_executor();
+    init_mime_resolver();
+    init_planner();
+    init_project_codec();
+    init_snapshot_loader();
+    init_project_codec();
+  }
+});
+
+// ../storage/src/index.ts
+var init_src = __esm({
+  "../storage/src/index.ts"() {
+    "use strict";
+    init_types();
+    init_asset_path();
+    init_path_tree();
+    init_manifest();
+    init_meta_file();
+    init_fs();
+    init_project_writer();
+    init_interface();
+    init_http();
+    init_sync_adapter();
+  }
+});
+
 // src/local-project.ts
 async function readJsonFile(filePath, label) {
   let raw;
@@ -62812,46 +62966,6 @@ var init_cli_color_dilate = __esm({
   }
 });
 
-// ../storage/src/sync-adapter.ts
-function assetNameFromPath(localPath, type) {
-  const parts = localPath.split("/");
-  const fileName = parts[parts.length - 1];
-  const ext = TYPE_EXTENSION[type];
-  if (ext && fileName.endsWith(ext)) {
-    return fileName.slice(0, -ext.length);
-  }
-  return fileName;
-}
-function findParentAssetId(localPath, entries) {
-  const parts = localPath.split("/");
-  if (parts.length <= 2)
-    return null;
-  const parentPath = parts.slice(0, -1).join("/");
-  for (const [assetId, entry] of Object.entries(entries)) {
-    if (entry.path === parentPath && entry.type === "Folder") {
-      return assetId;
-    }
-  }
-  return null;
-}
-var EXTENSION_TO_TYPE;
-var init_sync_adapter = __esm({
-  "../storage/src/sync-adapter.ts"() {
-    "use strict";
-    init_fs();
-    init_hash();
-    init_path_tree();
-    init_manifest();
-    init_meta_file();
-    init_asset_path();
-    EXTENSION_TO_TYPE = /* @__PURE__ */ new Map();
-    for (const [type, ext] of Object.entries(TYPE_EXTENSION)) {
-      if (ext)
-        EXTENSION_TO_TYPE.set(ext, type);
-    }
-  }
-});
-
 // src/domain-bridge/scene-parser.ts
 function extractMaterialProps(matData) {
   const props = {};
@@ -111543,19 +111657,31 @@ var HttpSyncApiClient = class {
     }
     const data = json2.data;
     if (typeof data.content === "string") {
-      try {
+      const raw = data.content;
+      if (raw === "") {
         ;
-        data.content = JSON.parse(data.content);
-      } catch {
-        throw new Error("Invalid response: invalid content field");
+        data.content = {};
+      } else {
+        try {
+          ;
+          data.content = JSON.parse(raw);
+        } catch {
+          throw new Error("Invalid response: invalid content field");
+        }
       }
     }
     if (typeof data.setting === "string") {
-      try {
+      const raw = data.setting;
+      if (raw === "") {
         ;
-        data.setting = JSON.parse(data.setting);
-      } catch {
-        throw new Error("Invalid response: invalid setting field");
+        data.setting = {};
+      } else {
+        try {
+          ;
+          data.setting = JSON.parse(raw);
+        } catch {
+          throw new Error("Invalid response: invalid setting field");
+        }
       }
     }
     if (typeof data.dependencies === "string") {
@@ -112768,7 +112894,7 @@ function parseJsonObjectOrThrow(input, context) {
   }
   return value;
 }
-function parseManifest(raw, manifestPath) {
+function parseManifest2(raw, manifestPath) {
   let parsed;
   try {
     parsed = JSON.parse(decodeUtf8(raw));
@@ -113107,7 +113233,7 @@ async function pushProject(opts) {
   throwIfAborted(signal);
   const manifestPath = import_node_path7.default.resolve(projectDir, ".galacean/manifest.json");
   const manifestRaw = await fs6.readFile(manifestPath);
-  const manifest = parseManifest(manifestRaw, manifestPath);
+  const manifest = parseManifest2(manifestRaw, manifestPath);
   const projectConfig = await readProjectConfig2(fs6, projectDir);
   const resolvedProjectSceneId = resolveProjectSceneId(projectConfig, manifest);
   const pushed = [];
@@ -113631,7 +113757,7 @@ async function pushProject(opts) {
 var import_node_path10 = __toESM(require("node:path"));
 
 // ../../node_modules/chokidar/esm/index.js
-var import_fs2 = require("fs");
+var import_fs5 = require("fs");
 var import_promises6 = require("fs/promises");
 var import_events = require("events");
 var sysPath2 = __toESM(require("path"), 1);
@@ -113856,7 +113982,7 @@ function readdirp(root, options = {}) {
 }
 
 // ../../node_modules/chokidar/esm/handler.js
-var import_fs = require("fs");
+var import_fs4 = require("fs");
 var import_promises5 = require("fs/promises");
 var sysPath = __toESM(require("path"), 1);
 var import_os = require("os");
@@ -114194,7 +114320,7 @@ function createFsWatchInstance(path16, options, listener, errHandler, emitRaw) {
     }
   };
   try {
-    return (0, import_fs.watch)(path16, {
+    return (0, import_fs4.watch)(path16, {
       persistent: options.persistent
     }, handleEvent);
   } catch (error48) {
@@ -114277,7 +114403,7 @@ var setFsWatchFileListener = (path16, fullPath, options, handlers) => {
   let cont = FsWatchFileInstances.get(fullPath);
   const copts = cont && cont.options;
   if (copts && (copts.persistent < options.persistent || copts.interval > options.interval)) {
-    (0, import_fs.unwatchFile)(fullPath);
+    (0, import_fs4.unwatchFile)(fullPath);
     cont = void 0;
   }
   if (cont) {
@@ -114288,7 +114414,7 @@ var setFsWatchFileListener = (path16, fullPath, options, handlers) => {
       listeners: listener,
       rawEmitters: rawEmitter,
       options,
-      watcher: (0, import_fs.watchFile)(fullPath, options, (curr, prev) => {
+      watcher: (0, import_fs4.watchFile)(fullPath, options, (curr, prev) => {
         foreach(cont.rawEmitters, (rawEmitter2) => {
           rawEmitter2(EV.CHANGE, fullPath, { curr, prev });
         });
@@ -114305,7 +114431,7 @@ var setFsWatchFileListener = (path16, fullPath, options, handlers) => {
     delFromSet(cont, KEY_RAW, rawEmitter);
     if (isEmptySet(cont.listeners)) {
       FsWatchFileInstances.delete(fullPath);
-      (0, import_fs.unwatchFile)(fullPath);
+      (0, import_fs4.unwatchFile)(fullPath);
       cont.options = cont.watcher = void 0;
       Object.freeze(cont);
     }
@@ -115148,7 +115274,7 @@ var FSWatcher = class extends import_events.EventEmitter {
     const now = /* @__PURE__ */ new Date();
     const writes = this._pendingWrites;
     function awaitWriteFinishFn(prevStat) {
-      (0, import_fs2.stat)(fullPath, (err, curStat) => {
+      (0, import_fs5.stat)(fullPath, (err, curStat) => {
         if (err || !writes.has(path16)) {
           if (err && err.code !== "ENOENT")
             awfEmit(err);
@@ -116412,7 +116538,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 = "0.0.1-alpha.1-alpha.1-alpha.1".length > 0 ? "0.0.1-alpha.1-alpha.1-alpha.1" : readCliVersionFromPackageJson();
+var CLI_VERSION = "0.0.1-alpha.3".length > 0 ? "0.0.1-alpha.3" : readCliVersionFromPackageJson();
 
 // src/push-output.ts
 function printPushResult(result, options = {}) {

package/package.json

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