@weapp-vite/volar 0.1.0-alpha.0 → 2.0.0

package/README.md

@@ -24,7 +24,7 @@ yarn add -D @weapp-vite/volar
 
 ## 功能特性
 
-- ✅ **配置文件智能提示** - 为 `<config>` 代码块提供完整的类型检查和自动补全
+- ✅ **配置文件智能提示** - 为 `<json>` 代码块提供完整的类型检查和自动补全
 - ✅ **JSON Schema 支持** - 支持 JSON Schema 验证和自动补全
 - ✅ **TypeScript 类型检查** - 利用 TypeScript 类型系统确保配置正确性
 - ✅ **自动推断配置类型** - 根据文件路径自动推断是 App/Page/Component 配置

package/dist/index.mjs

@@ -15,11 +15,13 @@ function getSchemaForType(type) {
 }
 
 // src/index.ts
-var BLOCK_TYPE = "config";
+var BLOCK_TYPE = "json";
 var JS_LANG = "js";
+var JSONC_LANG = "jsonc";
 var JSON_LANG = "json";
-var TS_LANG = "ts";
+var JSON5_LANG = "json5";
 var PLUGIN_VERSION = 2.2;
+var TS_LANG = "ts";
 var FULL_CAPABILITIES = {
   verification: true,
   completion: true,
@@ -44,19 +46,6 @@ try {
 } catch {
   hasSchematicsTypes = false;
 }
-function normalizeLang(lang) {
-  if (!lang) {
-    return JSON_LANG;
-  }
-  const lower = lang.toLowerCase();
-  if (lower === "txt") {
-    return JSON_LANG;
-  }
-  if (lower === "jsonc") {
-    return JSON_LANG;
-  }
-  return lower;
-}
 function normalizeFilename(filename) {
   if (!filename) {
     return "";
@@ -82,6 +71,16 @@ function inferConfigType(filename) {
   }
   return "Page";
 }
+function normalizeLang(lang) {
+  if (!lang) {
+    return JSON_LANG;
+  }
+  const lower = lang.toLowerCase();
+  if (lower === "txt") {
+    return JSON_LANG;
+  }
+  return lower;
+}
 function findExportDefaultExpression(code, tsModule, lang) {
   const scriptKind = lang === TS_LANG ? tsModule.ScriptKind.TS : tsModule.ScriptKind.JS;
   const sourceFile = tsModule.createSourceFile(
@@ -109,6 +108,31 @@ function findExportDefaultExpression(code, tsModule, lang) {
   }
   return null;
 }
+function injectSchemaIntoJsonObject(content, schemaId) {
+  const trimmed = content.trim();
+  if (!trimmed.startsWith("{")) {
+    return content;
+  }
+  const leftBraceIndex = content.indexOf("{");
+  if (leftBraceIndex < 0) {
+    return content;
+  }
+  const afterLeft = content.slice(leftBraceIndex + 1);
+  const firstNonSpace = afterLeft.match(/\S/);
+  const nextCharIndex = firstNonSpace ? leftBraceIndex + 1 + firstNonSpace.index : -1;
+  const isEmptyObject = nextCharIndex >= 0 && content[nextCharIndex] === "}";
+  const schemaLine = `  "$schema": "${schemaId}"`;
+  const injected = isEmptyObject ? `{
+${schemaLine}
+}` : `{
+${schemaLine},${content.slice(leftBraceIndex + 1)}`;
+  if (trimmed === content) {
+    return injected;
+  }
+  const leading = content.slice(0, content.indexOf(trimmed));
+  const trailing = content.slice(content.indexOf(trimmed) + trimmed.length);
+  return `${leading}${injected}${trailing}`;
+}
 var plugin = (ctx) => {
   let tsModule = ctx?.modules?.typescript;
   if (!tsModule) {
@@ -128,8 +152,12 @@ var plugin = (ctx) => {
         if (block.type === BLOCK_TYPE) {
           const normalizedLang = normalizeLang(block.lang);
           const isJsLike = normalizedLang === JS_LANG || normalizedLang === TS_LANG;
-          const lang = isJsLike ? TS_LANG : normalizedLang;
-          names.push({ id: `${BLOCK_TYPE}_${i}`, lang });
+          if (isJsLike) {
+            names.push({ id: `${BLOCK_TYPE}_${i}`, lang: TS_LANG });
+            continue;
+          }
+          const embeddedLang = normalizedLang === JSON_LANG || normalizedLang === JSONC_LANG || normalizedLang === JSON5_LANG ? JSONC_LANG : JSON_LANG;
+          names.push({ id: `${BLOCK_TYPE}_${i}`, lang: embeddedLang });
         }
       }
       return names;
@@ -155,8 +183,7 @@ var plugin = (ctx) => {
         ]);
         return;
       }
-      const userWantsJson = normalizedLang === "json" || normalizedLang === "jsonc" || block.content.includes("$schema");
-      const userWantsJs = normalizedLang === "js" || normalizedLang === "ts";
+      const userWantsJs = normalizedLang === JS_LANG || normalizedLang === TS_LANG;
       if (userWantsJs) {
         const parsed = tsModule && findExportDefaultExpression(block.content, tsModule, normalizedLang);
         if (parsed && hasSchematicsTypes) {
@@ -213,53 +240,22 @@ var plugin = (ctx) => {
         ]);
         return;
       }
-      if (userWantsJson) {
-        const schema = getSchemaForType(configType);
-        if (schema && schema.$id && !block.content.includes("$schema")) {
-          const schemaComment = `  "$schema": "${schema.$id}",
-`;
-          const content = block.content.trim();
-          const hasOpeningBrace = content.startsWith("{");
-          const injected = hasOpeningBrace ? `${content.slice(0, 1)}
-${schemaComment}${content.slice(1)}` : block.content;
-          embeddedCode.content.push([
-            injected,
-            block.name,
-            0,
-            FULL_CAPABILITIES
-          ]);
-        } else {
-          embeddedCode.content.push([
-            block.content,
-            block.name,
-            0,
-            FULL_CAPABILITIES
-          ]);
-        }
+      const schema = getSchemaForType(configType);
+      if (schema && schema.$id && !block.content.includes("$schema")) {
+        embeddedCode.content.push([
+          injectSchemaIntoJsonObject(block.content, schema.$id),
+          block.name,
+          0,
+          FULL_CAPABILITIES
+        ]);
         return;
       }
-      const prefix = `import type { ${configType} as __WeappConfig } from '@weapp-core/schematics'
-
-export default `;
-      const suffix = " satisfies __WeappConfig\n";
-      embeddedCode.content.push([
-        prefix,
-        void 0,
-        0,
-        VOID_CAPABILITIES
-      ]);
       embeddedCode.content.push([
         block.content,
         block.name,
         0,
         FULL_CAPABILITIES
       ]);
-      embeddedCode.content.push([
-        suffix,
-        void 0,
-        block.content.length,
-        VOID_CAPABILITIES
-      ]);
     }
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weapp-vite/volar",
-  "version": "0.1.0-alpha.0",
+  "version": "2.0.0",
   "description": "Volar plugin for weapp-vite - Provides IntelliSense and type checking for WeChat mini-program config blocks",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -25,22 +25,21 @@
   "sideEffects": false,
   "exports": {
     ".": {
-      "types": {
-        "import": "./dist/index.d.mts",
-        "require": "./dist/index.d.ts"
-      },
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.js"
+      "types": "./dist/index.d.mts",
+      "import": "./dist/index.mjs"
     }
   },
-  "main": "./dist/index.js",
+  "main": "./dist/index.mjs",
   "module": "./dist/index.mjs",
-  "types": "./dist/index.d.ts",
+  "types": "./dist/index.d.mts",
   "files": [
     "dist"
   ],
+  "engines": {
+    "node": "^20.19.0 || >=22.12.0"
+  },
   "dependencies": {
-    "@weapp-core/schematics": "4.0.1-alpha.0"
+    "@weapp-core/schematics": "6.0.0"
   },
   "scripts": {
     "dev": "tsup --watch --sourcemap",

package/dist/index.d.ts

@@ -1,5 +0,0 @@
-import { VueLanguagePlugin } from '@vue/language-core';
-
-declare const plugin: VueLanguagePlugin;
-
-export = plugin;

package/dist/index.js

@@ -1,275 +0,0 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }// ../../node_modules/.pnpm/tsup@8.5.1_@swc+core@1.15.7_jiti@2.6.1_postcss@8.5.6_tsx@4.21.0_typescript@5.9.3_yaml@2.8.2/node_modules/tsup/assets/cjs_shims.js
-var getImportMetaUrl = () => typeof document === "undefined" ? new URL(`file:${__filename}`).href : document.currentScript && document.currentScript.tagName.toUpperCase() === "SCRIPT" ? document.currentScript.src : new URL("main.js", document.baseURI).href;
-var importMetaUrl = /* @__PURE__ */ getImportMetaUrl();
-
-// src/index.ts
-var _module = require('module');
-
-// package.json
-var name = "@weapp-vite/volar";
-
-// src/schema.ts
-var _schematics = require('@weapp-core/schematics');
-function getSchemaForType(type) {
-  const definition = _schematics.JSON_SCHEMA_DEFINITIONS.find((d) => d.typeName === type);
-  if (!definition) {
-    return null;
-  }
-  return definition.schema;
-}
-
-// src/index.ts
-var BLOCK_TYPE = "config";
-var JS_LANG = "js";
-var JSON_LANG = "json";
-var TS_LANG = "ts";
-var PLUGIN_VERSION = 2.2;
-var FULL_CAPABILITIES = {
-  verification: true,
-  completion: true,
-  semantic: true,
-  navigation: true,
-  structure: true,
-  format: true
-};
-var VOID_CAPABILITIES = {
-  verification: false,
-  completion: false,
-  semantic: false,
-  navigation: false,
-  structure: false,
-  format: false
-};
-var require2 = _module.createRequire.call(void 0, importMetaUrl);
-var hasSchematicsTypes = false;
-try {
-  require2.resolve("@weapp-core/schematics");
-  hasSchematicsTypes = true;
-} catch (e) {
-  hasSchematicsTypes = false;
-}
-function normalizeLang(lang) {
-  if (!lang) {
-    return JSON_LANG;
-  }
-  const lower = lang.toLowerCase();
-  if (lower === "txt") {
-    return JSON_LANG;
-  }
-  if (lower === "jsonc") {
-    return JSON_LANG;
-  }
-  return lower;
-}
-function normalizeFilename(filename) {
-  if (!filename) {
-    return "";
-  }
-  return filename.replace(/\\/g, "/");
-}
-function inferConfigType(filename) {
-  const normalized = normalizeFilename(filename);
-  if (normalized.endsWith("/app.vue")) {
-    return "App";
-  }
-  if (normalized.includes("/plugin/")) {
-    return "Plugin";
-  }
-  if (normalized.includes("/components/")) {
-    return "Component";
-  }
-  if (normalized.includes("/theme/")) {
-    return "Theme";
-  }
-  if (normalized.includes("/sitemap")) {
-    return "Sitemap";
-  }
-  return "Page";
-}
-function findExportDefaultExpression(code, tsModule, lang) {
-  const scriptKind = lang === TS_LANG ? tsModule.ScriptKind.TS : tsModule.ScriptKind.JS;
-  const sourceFile = tsModule.createSourceFile(
-    `config.${lang}`,
-    code,
-    tsModule.ScriptTarget.Latest,
-    true,
-    scriptKind
-  );
-  for (const statement of sourceFile.statements) {
-    if (tsModule.isExportAssignment(statement)) {
-      const expressionStart = statement.expression.getStart(sourceFile);
-      const expressionEnd = statement.expression.getEnd();
-      const leading = code.slice(0, statement.getStart(sourceFile));
-      const expression = code.slice(expressionStart, expressionEnd);
-      const trailing = code.slice(statement.getEnd());
-      return {
-        expression,
-        expressionStart,
-        expressionEnd,
-        leading,
-        trailing
-      };
-    }
-  }
-  return null;
-}
-var plugin = (ctx) => {
-  let tsModule = _optionalChain([ctx, 'optionalAccess', _2 => _2.modules, 'optionalAccess', _3 => _3.typescript]);
-  if (!tsModule) {
-    try {
-      tsModule = require2("typescript");
-    } catch (e2) {
-      tsModule = void 0;
-    }
-  }
-  return {
-    name,
-    version: PLUGIN_VERSION,
-    getEmbeddedCodes(_, sfc) {
-      const names = [];
-      for (let i = 0; i < sfc.customBlocks.length; i++) {
-        const block = sfc.customBlocks[i];
-        if (block.type === BLOCK_TYPE) {
-          const normalizedLang = normalizeLang(block.lang);
-          const isJsLike = normalizedLang === JS_LANG || normalizedLang === TS_LANG;
-          const lang = isJsLike ? TS_LANG : normalizedLang;
-          names.push({ id: `${BLOCK_TYPE}_${i}`, lang });
-        }
-      }
-      return names;
-    },
-    resolveEmbeddedCode(fileName, sfc, embeddedCode) {
-      const match = embeddedCode.id.match(new RegExp(`^${BLOCK_TYPE}_(\\d+)$`));
-      if (!match) {
-        return;
-      }
-      const index = Number.parseInt(match[1]);
-      const block = sfc.customBlocks[index];
-      if (!block) {
-        return;
-      }
-      const normalizedLang = normalizeLang(block.lang);
-      const configType = inferConfigType(fileName);
-      if (!hasSchematicsTypes) {
-        embeddedCode.content.push([
-          block.content,
-          block.name,
-          0,
-          FULL_CAPABILITIES
-        ]);
-        return;
-      }
-      const userWantsJson = normalizedLang === "json" || normalizedLang === "jsonc" || block.content.includes("$schema");
-      const userWantsJs = normalizedLang === "js" || normalizedLang === "ts";
-      if (userWantsJs) {
-        const parsed = tsModule && findExportDefaultExpression(block.content, tsModule, normalizedLang);
-        if (parsed && hasSchematicsTypes) {
-          const typeImport = `import type { ${configType} as __WeappConfig } from '@weapp-core/schematics'
-`;
-          const helper = "const __weapp_defineConfig = <T extends __WeappConfig>(config: T) => config\n\n";
-          embeddedCode.content.push([
-            `${typeImport}${helper}`,
-            void 0,
-            0,
-            VOID_CAPABILITIES
-          ]);
-          if (parsed.leading) {
-            embeddedCode.content.push([
-              parsed.leading,
-              block.name,
-              0,
-              FULL_CAPABILITIES
-            ]);
-          }
-          embeddedCode.content.push([
-            "export default __weapp_defineConfig(",
-            void 0,
-            parsed.expressionStart,
-            VOID_CAPABILITIES
-          ]);
-          embeddedCode.content.push([
-            parsed.expression,
-            block.name,
-            parsed.expressionStart,
-            FULL_CAPABILITIES
-          ]);
-          embeddedCode.content.push([
-            ")",
-            void 0,
-            parsed.expressionEnd,
-            VOID_CAPABILITIES
-          ]);
-          if (parsed.trailing) {
-            embeddedCode.content.push([
-              parsed.trailing,
-              block.name,
-              parsed.expressionEnd,
-              FULL_CAPABILITIES
-            ]);
-          }
-          return;
-        }
-        embeddedCode.content.push([
-          block.content,
-          block.name,
-          0,
-          FULL_CAPABILITIES
-        ]);
-        return;
-      }
-      if (userWantsJson) {
-        const schema = getSchemaForType(configType);
-        if (schema && schema.$id && !block.content.includes("$schema")) {
-          const schemaComment = `  "$schema": "${schema.$id}",
-`;
-          const content = block.content.trim();
-          const hasOpeningBrace = content.startsWith("{");
-          const injected = hasOpeningBrace ? `${content.slice(0, 1)}
-${schemaComment}${content.slice(1)}` : block.content;
-          embeddedCode.content.push([
-            injected,
-            block.name,
-            0,
-            FULL_CAPABILITIES
-          ]);
-        } else {
-          embeddedCode.content.push([
-            block.content,
-            block.name,
-            0,
-            FULL_CAPABILITIES
-          ]);
-        }
-        return;
-      }
-      const prefix = `import type { ${configType} as __WeappConfig } from '@weapp-core/schematics'
-
-export default `;
-      const suffix = " satisfies __WeappConfig\n";
-      embeddedCode.content.push([
-        prefix,
-        void 0,
-        0,
-        VOID_CAPABILITIES
-      ]);
-      embeddedCode.content.push([
-        block.content,
-        block.name,
-        0,
-        FULL_CAPABILITIES
-      ]);
-      embeddedCode.content.push([
-        suffix,
-        void 0,
-        block.content.length,
-        VOID_CAPABILITIES
-      ]);
-    }
-  };
-};
-var index_default = plugin;
-
-
-exports.default = index_default;
-
-module.exports = exports.default;