@lvce-editor/test-worker 15.2.0 → 15.4.0

package/dist/api.d.ts

@@ -162,6 +162,16 @@ export interface Dirent {
 	readonly type: number;
 }
 
+export interface GitInitOptions {
+	readonly bare?: boolean;
+	readonly initialBranch?: string;
+	readonly uri?: string;
+}
+
+export interface GitPushOptions {
+	readonly setUpstream?: readonly string[];
+}
+
 export interface GitInvocation {
 	readonly command: readonly string[];
 	readonly cwd: string;
@@ -667,11 +677,13 @@ interface Git {
   readonly checkout: (ref: string) => Promise<void>;
   readonly clone: (repositoryUrl: string, cwd: string) => Promise<void>;
   readonly commit: (message: string) => Promise<void>;
+  readonly config: (values: Record<string, string>) => Promise<void>;
   readonly fetch: (remote: string) => Promise<void>;
-  readonly init: () => Promise<void>;
+  readonly init: (options?: GitInitOptions) => Promise<void>;
   readonly pull: (remote: string, branch: string) => Promise<void>;
-  readonly push: (remote: string, branch: string) => Promise<void>;
+  readonly push: (remoteOrOptions?: string | GitPushOptions, branch?: string) => Promise<void>;
   readonly setConfig: (key: string, value: string) => Promise<void>;
+  readonly shouldHaveCommit: (message: string) => Promise<void>;
   readonly shouldHaveInvocations: (invocations: readonly GitInvocation[]) => Promise<void>;
   readonly status: () => Promise<unknown>;
 }

package/dist/testWorkerMain.js

@@ -3945,8 +3945,8 @@ const FindWidget = {
   toggleUseRegularExpression: toggleUseRegularExpression$1
 };
 
-const init = async () => {
-  await invoke('ExtensionHost.executeCommand', 'git.init');
+const init = async (options = {}) => {
+  await invoke('ExtensionHost.executeCommand', 'git.init', options);
 };
 const clone = async (repositoryUrl, cwd) => {
   await invoke('ExtensionHost.executeCommand', 'git.clone', repositoryUrl, cwd);
@@ -3957,8 +3957,14 @@ const add = async pathSpec => {
 const commit = async message => {
   await invoke('ExtensionHost.executeCommand', 'git.commit', message);
 };
-const push$1 = async (remote, branch) => {
-  await invoke('ExtensionHost.executeCommand', 'git.push', remote, branch);
+const push$1 = async (remoteOrOptions, branch) => {
+  if (typeof remoteOrOptions === 'string') {
+    await invoke('ExtensionHost.executeCommand', 'git.push', {
+      setUpstream: [remoteOrOptions, branch || '']
+    });
+    return;
+  }
+  await invoke('ExtensionHost.executeCommand', 'git.push', remoteOrOptions || {});
 };
 const pull = async (remote, branch) => {
   await invoke('ExtensionHost.executeCommand', 'git.pull', remote, branch);
@@ -3981,6 +3987,26 @@ const addRemote = async (name, remoteUrl) => {
 const setConfig = async (key, value) => {
   await invoke('ExtensionHost.executeCommand', 'git.setConfig', key, value);
 };
+const config = async values => {
+  for (const [key, value] of Object.entries(values)) {
+    await setConfig(key, value);
+  }
+};
+const shouldHaveCommit = async message => {
+  const commits = await invoke('ExtensionHost.executeCommand', 'git.getCommits');
+  if (!Array.isArray(commits)) {
+    throw new TypeError(`Expected commits to be an array, but got ${commits}`);
+  }
+  if (commits.length !== 1) {
+    throw new Error(`Expected 1 commit, but got ${commits.length}`);
+  }
+  if (!commits[0].hash) {
+    throw new Error('Expected commit hash to be defined');
+  }
+  if (commits[0].message !== message) {
+    throw new Error(`Expected commit message to be "${message}", but got "${commits[0].message}"`);
+  }
+};
 const shouldHaveInvocations = async invocations => {
   // TODO
 };
@@ -3992,11 +4018,13 @@ const Git = {
   checkout,
   clone,
   commit,
+  config,
   fetch: fetch$1,
   init,
   pull,
   push: push$1,
   setConfig,
+  shouldHaveCommit,
   shouldHaveInvocations,
   status
 };
@@ -5356,96 +5384,13 @@ const handleFileWatcherEvent = async event => {
   await hotReloadTest(lastItem, locationHref, time);
 };
 
-const whitespaceRegex = /\s+/g;
-const shouldHavePayloadSearch = 'shouldHavePayload(';
-const validIdentifierRegex = /^[A-Za-z_$][A-Za-z0-9_$]*$/;
-const normalizeWhitespace = value => {
-  return value.replaceAll(whitespaceRegex, '');
-};
-const isObject = value => {
-  return typeof value === 'object' && value !== null && !Array.isArray(value);
-};
-const projectActualOntoExpected = (actualValue, expectedValue) => {
-  if (Array.isArray(expectedValue)) {
-    if (!Array.isArray(actualValue)) {
-      return actualValue;
-    }
-    const length = Math.min(expectedValue.length, actualValue.length);
-    return actualValue.slice(0, length).map((item, index) => projectActualOntoExpected(item, expectedValue[index]));
-  }
-  if (isObject(expectedValue)) {
-    if (!isObject(actualValue)) {
-      return actualValue;
-    }
-    const result = {};
-    for (const key of Object.keys(expectedValue)) {
-      if (!Object.hasOwn(actualValue, key)) {
-        continue;
-      }
-      result[key] = projectActualOntoExpected(actualValue[key], expectedValue[key]);
-    }
-    return result;
-  }
-  return actualValue;
-};
-const quoteString = value => {
-  return `'${value.replaceAll('\\', '\\\\').replaceAll("'", "\\'").replaceAll('\n', '\\n').replaceAll('\r', '\\r').replaceAll('\t', '\\t')}'`;
-};
-const formatObjectKey = key => {
-  if (validIdentifierRegex.test(key)) {
-    return key;
-  }
-  return quoteString(key);
-};
-const trySerialize = (value, indent = 0) => {
-  try {
-    if (value === null) {
-      return 'null';
-    }
-    if (typeof value === 'string') {
-      return quoteString(value);
-    }
-    if (typeof value === 'number' || typeof value === 'boolean') {
-      return JSON.stringify(value);
-    }
-    if (Array.isArray(value)) {
-      if (value.length === 0) {
-        return '[]';
-      }
-      const nextIndent = indent + 2;
-      const serializedItems = value.map(item => `${' '.repeat(nextIndent)}${trySerialize(item, nextIndent)}`);
-      return `[
-${serializedItems.join(',\n')}
-${' '.repeat(indent)}]`;
-    }
-    if (isObject(value)) {
-      const entries = Object.entries(value);
-      if (entries.length === 0) {
-        return '{}';
-      }
-      const nextIndent = indent + 2;
-      const serializedEntries = [];
-      for (const entry of entries) {
-        const [key, item] = entry;
-        serializedEntries.push(`${' '.repeat(nextIndent)}${formatObjectKey(key)}: ${trySerialize(item, nextIndent)}`);
-      }
-      return `{
-${serializedEntries.join(',\n')}
-${' '.repeat(indent)}}`;
-    }
-    return undefined;
-  } catch {
-    return undefined;
+const isAutoFixError = value => {
+  if (!value) {
+    return false;
   }
+  return value.code === 'chat-debug.should-have-payload';
 };
-const replaceMatch = (fileContent, index, length, replacement) => {
-  const before = fileContent.slice(0, index);
-  const after = fileContent.slice(index + length);
-  return `${before}${replacement}${after}`;
-};
-const isStringDelimiter = character => {
-  return character === "'" || character === '"' || character === '`';
-};
+
 const consumeComment = (inBlockComment, inLineComment, character, nextCharacter) => {
   if (inLineComment) {
     if (character === '\n') {
@@ -5495,6 +5440,11 @@ const consumeComment = (inBlockComment, inLineComment, character, nextCharacter)
     inLineComment
   };
 };
+
+const isStringDelimiter = character => {
+  return character === "'" || character === '"' || character === '`';
+};
+
 const consumeString = (stringDelimiter, character) => {
   if (!stringDelimiter) {
     if (isStringDelimiter(character)) {
@@ -5525,6 +5475,7 @@ const consumeString = (stringDelimiter, character) => {
     stringDelimiter
   };
 };
+
 const findClosingParenthesis = (fileContent, startIndex) => {
   let depth = 1;
   let inBlockComment = false;
@@ -5570,6 +5521,8 @@ const findClosingParenthesis = (fileContent, startIndex) => {
   }
   return -1;
 };
+
+const shouldHavePayloadSearch = 'shouldHavePayload(';
 const findShouldHavePayloadMatches = fileContent => {
   const matches = [];
   let searchIndex = 0;
@@ -5592,6 +5545,101 @@ const findShouldHavePayloadMatches = fileContent => {
   }
   return matches;
 };
+
+const whitespaceRegex = /\s+/g;
+const trailingCommaRegex = /,([}\]])/g;
+const normalizeWhitespace = value => {
+  return value.replaceAll(whitespaceRegex, '').replaceAll(trailingCommaRegex, '$1');
+};
+
+const isObject = value => {
+  return typeof value === 'object' && value !== null && !Array.isArray(value);
+};
+
+const projectActualOntoExpected = (actualValue, expectedValue) => {
+  if (Array.isArray(expectedValue)) {
+    if (!Array.isArray(actualValue)) {
+      return actualValue;
+    }
+    const length = Math.min(expectedValue.length, actualValue.length);
+    return actualValue.slice(0, length).map((item, index) => projectActualOntoExpected(item, expectedValue[index]));
+  }
+  if (isObject(expectedValue)) {
+    if (!isObject(actualValue)) {
+      return actualValue;
+    }
+    const result = {};
+    for (const key of Object.keys(expectedValue)) {
+      if (!Object.hasOwn(actualValue, key)) {
+        continue;
+      }
+      result[key] = projectActualOntoExpected(actualValue[key], expectedValue[key]);
+    }
+    return result;
+  }
+  return actualValue;
+};
+
+const replaceMatch = (fileContent, index, length, replacement) => {
+  const before = fileContent.slice(0, index);
+  const after = fileContent.slice(index + length);
+  return `${before}${replacement}${after}`;
+};
+
+const quoteString = value => {
+  return `'${value.replaceAll('\\', '\\\\').replaceAll("'", "\\'").replaceAll('\n', '\\n').replaceAll('\r', '\\r').replaceAll('\t', '\\t')}'`;
+};
+
+const validIdentifierRegex = /^[A-Za-z_$][A-Za-z0-9_$]*$/;
+const formatObjectKey = key => {
+  if (validIdentifierRegex.test(key)) {
+    return key;
+  }
+  return quoteString(key);
+};
+
+const trySerialize = (value, indent = 0) => {
+  try {
+    if (value === null) {
+      return 'null';
+    }
+    if (typeof value === 'string') {
+      return quoteString(value);
+    }
+    if (typeof value === 'number' || typeof value === 'boolean') {
+      return JSON.stringify(value);
+    }
+    if (Array.isArray(value)) {
+      if (value.length === 0) {
+        return '[]';
+      }
+      const nextIndent = indent + 2;
+      const serializedItems = value.map(item => `${' '.repeat(nextIndent)}${trySerialize(item, nextIndent)}`);
+      return `[
+${serializedItems.join(',\n')}
+${' '.repeat(indent)}]`;
+    }
+    if (isObject(value)) {
+      const entries = Object.entries(value);
+      if (entries.length === 0) {
+        return '{}';
+      }
+      const nextIndent = indent + 2;
+      const serializedEntries = [];
+      for (const entry of entries) {
+        const [key, item] = entry;
+        serializedEntries.push(`${' '.repeat(nextIndent)}${formatObjectKey(key)}: ${trySerialize(item, nextIndent)}`);
+      }
+      return `{
+${serializedEntries.join(',\n')}
+${' '.repeat(indent)}}`;
+    }
+    return undefined;
+  } catch {
+    return undefined;
+  }
+};
+
 const replaceShouldHavePayload = (fileContent, expectedPayload, actualPayload) => {
   const minimalPayload = projectActualOntoExpected(actualPayload, expectedPayload);
   const serializedMinimalPayload = trySerialize(minimalPayload);
@@ -5623,6 +5671,7 @@ const replaceShouldHavePayload = (fileContent, expectedPayload, actualPayload) =
   const [candidate] = matchingCandidates;
   return replaceMatch(fileContent, candidate.index, candidate.length, `shouldHavePayload(${serializedMinimalPayload})`);
 };
+
 const getFileUrlFromRemotePath = rawPathName => {
   if (!rawPathName.startsWith('/remote')) {
     return undefined;
@@ -5630,6 +5679,7 @@ const getFileUrlFromRemotePath = rawPathName => {
   const rest = rawPathName.slice('/remote'.length);
   return `file://${rest}`;
 };
+
 const toFileUrl = (url, locationHref) => {
   const parsedUrl = new URL(url, locationHref);
   if (parsedUrl.protocol === 'file:') {
@@ -5639,68 +5689,39 @@ const toFileUrl = (url, locationHref) => {
   }
   return getFileUrlFromRemotePath(parsedUrl.pathname);
 };
-const isAutoFixError = value => {
-  if (!value) {
-    return false;
-  }
-  return value.code === 'chat-debug.should-have-payload';
-};
-const defaultDependencies = {
-  getAutoFixError() {
-    return get$1();
-  },
-  getLatestTestInfo() {
-    return maybeLast();
-  },
-  getLocationHref() {
-    return location.href;
-  },
-  now: Date.now,
-  readFile(uri) {
-    return readFile(uri);
-  },
-  rerun(url, platform, assetDir) {
-    return execute(url, platform, assetDir);
-  },
-  setAutoFixError(value) {
-    set$1(value);
-  },
-  writeFile(uri, content) {
-    return writeFile(uri, content);
-  }
-};
-const tryAutoFixWith = async dependencies => {
-  const latestTestInfo = dependencies.getLatestTestInfo();
+
+const tryAutoFixWith = async () => {
+  const latestTestInfo = maybeLast();
   if (!latestTestInfo) {
     return;
   }
   if (latestTestInfo.inProgress) {
     return;
   }
-  const autoFixError = dependencies.getAutoFixError();
+  const autoFixError = get$1();
   if (!isAutoFixError(autoFixError)) {
     return;
   }
   if (autoFixError.actualPayload === undefined) {
     return;
   }
-  const locationHref = dependencies.getLocationHref();
-  const fileUrl = toFileUrl(latestTestInfo.url, locationHref);
+  const fileUrl = toFileUrl(latestTestInfo.url, location.href);
   if (!fileUrl) {
     return;
   }
-  const fileContent = await dependencies.readFile(fileUrl);
+  const fileContent = await readFile(fileUrl);
   const updatedFileContent = replaceShouldHavePayload(fileContent, autoFixError.expectedPayload, autoFixError.actualPayload);
   if (!updatedFileContent || updatedFileContent === fileContent) {
     return;
   }
-  await dependencies.writeFile(fileUrl, updatedFileContent);
-  dependencies.setAutoFixError(undefined);
-  const rerunUrl = createUrlWithQueryParameter(latestTestInfo.url, locationHref, dependencies.now());
-  await dependencies.rerun(rerunUrl, latestTestInfo.platform, latestTestInfo.assetDir);
+  await writeFile(fileUrl, updatedFileContent);
+  set$1(undefined);
+  const rerunUrl = createUrlWithQueryParameter(latestTestInfo.url, location.href, Date.now());
+  await execute(rerunUrl, latestTestInfo.platform, latestTestInfo.assetDir);
 };
+
 const tryAutoFix = async () => {
-  await tryAutoFixWith(defaultDependencies);
+  await tryAutoFixWith();
 };
 
 const commandMap = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/test-worker",
-  "version": "15.2.0",
+  "version": "15.4.0",
   "description": "Test Worker",
   "repository": {
     "type": "git",