@lvce-editor/shared-process 0.15.19 → 0.15.21

package/index.js

@@ -1,4 +1,4 @@
-import { dirname, join } from 'node:path'
+import { dirname, isAbsolute, join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
 const __dirname = dirname(fileURLToPath(import.meta.url))
@@ -10,7 +10,7 @@ export const exportStatic = async ({ extensionPath = process.cwd(), testPath = '
     throw new Error(`root argument is required`)
   }
   const fn = await import('./src/parts/ExportStatic/ExportStatic.js')
-  if (extensionPath !== root) {
+  if (extensionPath !== root && !isAbsolute(extensionPath)) {
     extensionPath = join(root, extensionPath)
   }
   const pathPrefix = process.env.PATH_PREFIX || ''

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.15.19",
+  "version": "0.15.21",
   "description": "Utility package for @lvce-editor/server",
   "main": "index.js",
   "type": "module",
@@ -17,9 +17,9 @@
   },
   "dependencies": {
     "@babel/code-frame": "^7.21.4",
-    "@lvce-editor/extension-host": "0.15.19",
-    "@lvce-editor/extension-host-helper-process": "0.15.19",
-    "@lvce-editor/pty-host": "0.15.19",
+    "@lvce-editor/extension-host": "0.15.21",
+    "@lvce-editor/extension-host-helper-process": "0.15.21",
+    "@lvce-editor/pty-host": "0.15.21",
     "debug": "^4.3.4",
     "execa": "^7.1.1",
     "exit-hook": "^3.2.0",

package/src/parts/ExitCode/ExitCode.js

@@ -2,4 +2,4 @@ export const Error = 1
 
 export const ExpectedError = 128
 
-export const Sucess = 0
+export const Success = 0

package/src/parts/ExportStatic/ExportStatic.js

@@ -1,6 +1,8 @@
+import { isAbsolute, join } from 'path'
 import * as FileSystem from '../FileSystem/FileSystem.js'
 import * as JsonFile from '../JsonFile/JsonFile.js'
 import * as Path from '../Path/Path.js'
+import { existsSync } from 'fs'
 
 // TODO
 // - implement this for syntax highlighting projects
@@ -80,7 +82,7 @@ const isCommitHash = (dirent) => {
  * @param {string} root
  */
 const clean = async (root) => {
-  await FileSystem.remove(Path.join(root, 'dist'))
+  await FileSystem.forceRemove(Path.join(root, 'dist'))
   await FileSystem.mkdir(Path.join(root, 'dist'))
 }
 
@@ -308,7 +310,7 @@ const addExtensionLanguages = async ({ root, extensionPath, extensionJson, commi
     return
   }
   const extensionId = extensionJson.id
-  await FileSystem.remove(Path.join(root, 'dist', commitHash, 'extensions', extensionId))
+  await FileSystem.forceRemove(Path.join(root, 'dist', commitHash, 'extensions', extensionId))
   await FileSystem.mkdir(Path.join(root, 'dist', commitHash, 'extensions', extensionId))
   await FileSystem.copyFile(Path.join(root, 'README.md'), Path.join(root, 'dist', commitHash, 'extensions', extensionId, 'README.md'))
   for (const file of ['src', 'data', 'extension.json']) {
@@ -330,7 +332,7 @@ const addExtensionLanguages = async ({ root, extensionPath, extensionJson, commi
   const mergedLanguages = mergeLanguages(builtinLanguages, extensionLanguages)
   await JsonFile.writeJson(Path.join(root, 'dist', commitHash, 'config', 'languages.json'), mergedLanguages)
   if (await FileSystem.exists(Path.join(extensionPath, 'test', 'cases'))) {
-    await FileSystem.remove(Path.join(root, 'dist', commitHash, 'playground'))
+    await FileSystem.forceRemove(Path.join(root, 'dist', commitHash, 'playground'))
     await FileSystem.copy(Path.join(extensionPath, 'test', 'cases'), Path.join(root, 'dist', commitHash, 'playground'))
     const testFiles = await FileSystem.readDir(Path.join(extensionPath, 'test', 'cases'))
     const fileMap = testFiles.map(toPlaygroundFile)
@@ -426,12 +428,12 @@ const getTestFiles = (testFilesRaw) => {
 }
 
 const addTestFiles = async ({ testPath, commitHash, root, pathPrefix }) => {
-  await FileSystem.copy(`${root}/${testPath}/src`, `${root}/dist/${commitHash}/packages/extension-host-worker-tests/src`)
-  const testFilesRaw = await FileSystem.readDir(`${root}/${testPath}/src`)
+  const testRoot = isAbsolute(testPath) ? testPath : join(root, testPath)
+  await FileSystem.copy(`${testRoot}/src`, `${root}/dist/${commitHash}/packages/extension-host-worker-tests/src`)
+  const testFilesRaw = await FileSystem.readDir(`${testRoot}/src`)
   const testFiles = getTestFiles(testFilesRaw)
   await FileSystem.mkdir(`${root}/dist/${commitHash}/tests`)
   await FileSystem.mkdir(`${root}/dist/tests`)
-  console.log({ testFiles })
   for (const testFile of testFiles) {
     await FileSystem.copyFile(`${root}/dist/index.html`, `${root}/dist/tests/${testFile}.html`)
   }
@@ -444,6 +446,12 @@ const addTestFiles = async ({ testPath, commitHash, root, pathPrefix }) => {
  * @param {{root:string, pathPrefix:string , extensionPath:string, testPath:string   }} param0
  */
 export const exportStatic = async ({ root, pathPrefix, extensionPath, testPath }) => {
+  if (!existsSync(root)) {
+    throw new Error(`root path does not exist: ${root}`)
+  }
+  if (!existsSync(extensionPath)) {
+    throw new Error(`extension path does not exist: ${extensionPath}`)
+  }
   if (pathPrefix === 'auto') {
     const extensionJson = await readExtensionManifest(Path.join(extensionPath, 'extension.json'))
     const { id } = extensionJson

package/src/parts/FileSystem/FileSystem.js

@@ -123,6 +123,18 @@ export const remove = async (path) => {
   }
 }
 
+export const forceRemove = async (path) => {
+  if (!isOkayToRemove(path)) {
+    console.warn('not removing path')
+    return
+  }
+  try {
+    await fs.rm(path, { force: true, recursive: true })
+  } catch (error) {
+    throw new VError(error, `Failed to remove "${path}"`)
+  }
+}
+
 export const exists = async (path) => {
   try {
     await fs.access(path)

package/src/parts/Signal/Signal.js

@@ -1,2 +1,3 @@
 export const SIGUSR1 = 'SIGUSR1'
 export const SIGTERM = 'SIGTERM'
+export const SIGINT = 'SIGINT'

package/src/parts/Trash/Trash.js

@@ -1,8 +1,8 @@
-import { default as _trash } from 'trash'
 import { VError } from '../VError/VError.js'
 
 export const trash = async (path) => {
   try {
+    const { default: _trash } = await import('trash')
     await _trash(path)
   } catch (error) {
     throw new VError(error, 'Failed to move item to trash')

package/src/sharedProcessMain.js

@@ -1,5 +1,6 @@
 import * as Command from './parts/Command/Command.js'
 import * as ErrorHandling from './parts/ErrorHandling/ErrorHandling.js'
+import * as ExitCode from './parts/ExitCode/ExitCode.js'
 import * as Module from './parts/Module/Module.js'
 import * as ParentIpc from './parts/ParentIpc/ParentIpc.js'
 import * as Process from './parts/Process/Process.js'
@@ -10,6 +11,7 @@ import * as Signal from './parts/Signal/Signal.js'
 
 const handleDisconnect = () => {
   console.info('[shared process] disconnected')
+  Process.exit(ExitCode.Success)
 }
 
 // const handleBeforeExit = () => {
@@ -18,6 +20,7 @@ const handleDisconnect = () => {
 
 const handleSigTerm = () => {
   console.info('[shared-process] sigterm')
+  Process.exit(ExitCode.Success)
 }
 
 const knownCliArgs = ['install', 'list', 'link', 'unlink']
@@ -31,22 +34,11 @@ const main = async () => {
     await module.handleCliArgs(argv)
     return
   }
-
-  console.log('[shared process] started')
   // process.on('beforeExit', handleBeforeExit)
   process.on('disconnect', handleDisconnect)
   process.on(Signal.SIGTERM, handleSigTerm)
-
   process.on('uncaughtExceptionMonitor', ErrorHandling.handleUncaughtExceptionMonitor)
   await ParentIpc.listen()
-
-  // ExtensionHost.start() // TODO start on demand, e.g. not when extensions should be disabled
 }
 
 main()
-
-// TODO when browser reloads or opens in new tab how does the window know which folder to open?
-
-// setTimeout(() => {
-//   throw new Error('oops')
-// }, 210)