@lvce-editor/shared-process 0.6.1 → 0.7.1

package/config/defaultKeyBindings.json

@@ -627,7 +627,8 @@
   },
   {
     "key": "ctrl+shift+r",
-    "command": "file.openRecent"
+    "command": "Viewlet.openWidget",
+    "args": ["QuickPick", "recent"]
   },
   {
     "key": "ArrowDown",

package/extensions/builtin.language-basics-dotenv/extension.json

@@ -6,7 +6,8 @@
     {
       "id": "dotenv",
       "extensions": [".env", ".env.local"],
-      "configuration": "./languageConfiguration.json"
+      "configuration": "./languageConfiguration.json",
+      "tokenize": "src/tokenizeDotenv.js"
     }
   ]
 }

package/extensions/builtin.language-basics-json/src/tokenizeJson.js

@@ -47,6 +47,7 @@ export const TokenType = {
   Error: 18,
   Unknown: 19,
   Text: 20,
+  JsonPropertyValueString: 21,
 }
 
 export const TokenMap = {
@@ -70,6 +71,7 @@ export const TokenMap = {
   [TokenType.NewLine]: 'NewLine',
   [TokenType.Text]: 'Text',
   [TokenType.Numeric]: 'Numeric',
+  [TokenType.JsonPropertyValueString]: 'JsonPropertyValueString',
 }
 
 const RE_SELECTOR = /^[\.a-zA-Z\d\-\:>]+/
@@ -205,7 +207,7 @@ export const tokenizeLine = (line, lineState) => {
         break
       case State.InsideString:
         if ((next = part.match(RE_STRING_DOUBLE_QUOTE_CONTENT))) {
-          token = TokenType.String
+          token = TokenType.JsonPropertyValueString
           state = State.InsideString
         } else if ((next = part.match(RE_DOUBLE_QUOTE))) {
           token = TokenType.Punctuation

package/extensions/builtin.theme-slime/color-theme.json

@@ -65,6 +65,10 @@
       "name": "String",
       "foreground": "#82A2B4"
     },
+    {
+      "name": "JsonPropertyValueString",
+      "foreground": "#82A2B4"
+    },
     {
       "name": "Import",
       "foreground": "#82A2B4"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/shared-process",
-  "version": "0.6.1",
+  "version": "0.7.1",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -20,13 +20,13 @@
     "node": ">=16"
   },
   "dependencies": {
-    "@lvce-editor/extension-host": "0.6.1",
-    "@lvce-editor/pty-host": "0.6.1",
+    "@lvce-editor/extension-host": "0.7.1",
+    "@lvce-editor/pty-host": "0.7.1",
     "chokidar": "^3.5.3",
     "debug": "^4.3.4",
     "execa": "^6.1.0",
     "exit-hook": "^3.1.0",
-    "got": "^12.5.0",
+    "got": "^12.5.1",
     "is-object": "^1.0.2",
     "json-parse-even-better-errors": "^2.3.1",
     "jsonc-parser": "^3.2.0",

package/src/parts/ExtensionInstall/ExtensionInstall.js

@@ -1,13 +1,16 @@
 import * as ExtensionInstallParseInput from '../ExtensionInstallParseInput/ExtensionInstallParseInput.js'
+import * as ExtensionInstallType from '../ExtensionInstallType/ExtensionInstallType.js'
 
 const getModule = (type) => {
   switch (type) {
-    case ExtensionInstallParseInput.InstallType.GithubRepository:
+    case ExtensionInstallType.GithubRepository:
       return import(
         '../ExtensionInstallFromGitHub/ExtensionInstallFromGitHub.js'
       )
-    case ExtensionInstallParseInput.InstallType.Url:
+    case ExtensionInstallType.Url:
       return import('../ExtensionInstallFromUrl/ExtensionInstallFromUrl.js')
+    case ExtensionInstallType.File:
+      return import('../ExtensionInstallFromFile/ExtensionInstallFromFile.js')
     default:
       throw new Error('module not found')
   }
@@ -15,10 +18,9 @@ const getModule = (type) => {
 
 export const install = async (input) => {
   const parsed = ExtensionInstallParseInput.parse(input)
-  if (parsed.type === ExtensionInstallParseInput.InstallType.ParsingError) {
-    throw new Error(`Failed to parse input: ${parsed.options.message}`)
+  if (parsed.type === ExtensionInstallType.ParsingError) {
+    throw new Error(`Cannot install ${input}: ${parsed.options.message}`)
   }
-  console.log({ parsed })
   const module = await getModule(parsed.type)
   // @ts-ignore
   await module.install(parsed.options)

package/src/parts/ExtensionInstallFromFile/ExtensionInstallFromFile.js

@@ -0,0 +1,39 @@
+import VError from 'verror'
+import * as Assert from '../Assert/Assert.js'
+import * as Extract from '../Extract/Extract.js'
+import * as FileSystem from '../FileSystem/FileSystem.js'
+import * as Path from '../Path/Path.js'
+import * as Platform from '../Platform/Platform.js'
+
+const getCachedExtensionFolderName = (path) => {
+  const baseName = Path.basename(path)
+  if (baseName.endsWith('.tar.br')) {
+    return 'file-' + baseName.slice(0, -'.tar.br'.length)
+  }
+  return `file-${baseName}`
+}
+
+export const install = async ({ path }) => {
+  try {
+    const cachedExtensionsPath = Platform.getCachedExtensionsPath()
+    const cachedExtensionFolderName = getCachedExtensionFolderName(path)
+    const cachedExtensionPath = Path.join(
+      cachedExtensionsPath,
+      cachedExtensionFolderName
+    )
+    await Extract.extractTarBr(path, cachedExtensionPath)
+    const extensionsPath = Platform.getExtensionsPath()
+    const manifestPath = Path.join(cachedExtensionPath, 'extension.json')
+    const manifestContent = await FileSystem.readFile(manifestPath)
+    const manifestJson = JSON.parse(manifestContent)
+    const id = manifestJson.id
+    if (!id) {
+      throw new Error('missing id in extension manifest')
+    }
+    const outDir = Path.join(extensionsPath, id)
+    await FileSystem.remove(outDir)
+    await FileSystem.rename(cachedExtensionPath, outDir)
+  } catch (error) {
+    throw new VError(error, `Failed to install ${path}`)
+  }
+}

package/src/parts/ExtensionInstallParseInput/ExtensionInstallParseInput.js

@@ -1,8 +1,5 @@
-export const InstallType = {
-  Url: 1,
-  GithubRepository: 2,
-  ParsingError: 3,
-}
+import * as ExtensionInstallType from '../ExtensionInstallType/ExtensionInstallType.js'
+import * as Path from '../Path/Path.js'
 
 const parseUrlGithub = (input) => {
   const parts = input.split('/')
@@ -11,7 +8,7 @@ const parseUrlGithub = (input) => {
     const user = parts[3]
     const repo = parts[4]
     return {
-      type: InstallType.GithubRepository,
+      type: ExtensionInstallType.GithubRepository,
       options: {
         user,
         repo,
@@ -26,7 +23,7 @@ const parseUrlGithub = (input) => {
     const commit = parts[6]
     if (type === 'tree') {
       return {
-        type: InstallType.GithubRepository,
+        type: ExtensionInstallType.GithubRepository,
         options: {
           user,
           repo,
@@ -36,7 +33,7 @@ const parseUrlGithub = (input) => {
     }
     if (type === 'pull') {
       return {
-        type: InstallType.ParsingError,
+        type: ExtensionInstallType.ParsingError,
         options: {
           message: 'Cannot download from Pull Request',
         },
@@ -44,7 +41,7 @@ const parseUrlGithub = (input) => {
     }
   }
   return {
-    type: InstallType.ParsingError,
+    type: ExtensionInstallType.ParsingError,
     options: {
       message: 'Failed to parse github url',
     },
@@ -57,26 +54,41 @@ const parseUrl = (input) => {
   }
   if (input.endsWith('.tar.br')) {
     return {
-      type: InstallType.Url,
+      type: ExtensionInstallType.Url,
       options: {
         url: input,
       },
     }
   }
   return {
-    type: InstallType.ParsingError,
+    type: ExtensionInstallType.ParsingError,
     options: {
       message: 'Failed to parse url',
     },
   }
 }
 
+const parseFile = (input) => {
+  return {
+    type: ExtensionInstallType.File,
+    options: {
+      path: input,
+    },
+  }
+}
+
 export const parse = (input) => {
   if (input.startsWith('https://')) {
     return parseUrl(input)
   }
+  if (input.startsWith('.')) {
+    return parseFile(input)
+  }
+  if (Path.isAbsolute(input)) {
+    return parseFile(input)
+  }
   return {
-    type: InstallType.ParsingError,
+    type: ExtensionInstallType.ParsingError,
     options: {
       message: 'Failed to parse input',
     },

package/src/parts/ExtensionInstallType/ExtensionInstallType.js

@@ -0,0 +1,7 @@
+export const Url = 1
+
+export const GithubRepository = 2
+
+export const ParsingError = 3
+
+export const File = 4

package/src/parts/ExtensionLink/ExtensionLink.js

@@ -7,6 +7,10 @@ import * as SymLink from '../SymLink/SymLink.js'
 
 const linkFallBack = async (path) => {
   try {
+    const manifestPath = Path.join(path, 'extension.json')
+    if (!(await FileSystem.exists(manifestPath))) {
+      throw new Error('no extension manifest found')
+    }
     const extensionsPath = Platform.getExtensionsPath()
     const baseName = Path.basename(path)
     const to = Path.join(extensionsPath, baseName)
@@ -19,6 +23,10 @@ const linkFallBack = async (path) => {
 
 export const link = async (path) => {
   try {
+    const manifestPath = Path.join(path, 'extension.json')
+    if (!(await FileSystem.exists(manifestPath))) {
+      throw new Error('no extension manifest found')
+    }
     const extensionsPath = Platform.getExtensionsPath()
     const baseName = Path.basename(path)
     const to = Path.join(extensionsPath, baseName)

package/src/parts/Path/Path.js

@@ -19,3 +19,11 @@ export const dirname = (path) => {
 export const basename = (path) => {
   return NodePath.basename(path)
 }
+
+export const resolve = (path) => {
+  return NodePath.resolve(path)
+}
+
+export const isAbsolute = (path) => {
+  return NodePath.isAbsolute(path)
+}