@vue-jsx-vapor/compiler 0.1.4 → 0.1.6

package/dist/index.cjs

@@ -1,4 +1,4 @@
-"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; }// src/index.ts
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } 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; }// src/index.ts
 var _compilervapor = require('@vue/compiler-vapor');
 
 // src/compile.ts
@@ -20,7 +20,6 @@ var _parser = require('@babel/parser');
 
 
 
-
 // src/transforms/utils.ts
 
 
@@ -83,14 +82,11 @@ var isConstant = (node) => {
   }
   return false;
 };
-function isLiteralExpressionContainer(node) {
-  return _optionalChain([node, 'optionalAccess', _2 => _2.type]) === "JSXExpressionContainer" && node.expression.type !== "JSXEmptyExpression" && isConstant(node.expression);
-}
 var EMPTY_TEXT_REGEX = /^\s*[\n\r]\s*$/;
 var START_EMPTY_TEXT_REGEX = /^\s*[\n\r]/;
 var END_EMPTY_TEXT_REGEX = /[\n\r]\s*$/;
 function resolveJSXText(node) {
-  if (EMPTY_TEXT_REGEX.test(`${_optionalChain([node, 'access', _3 => _3.extra, 'optionalAccess', _4 => _4.raw])}`)) {
+  if (EMPTY_TEXT_REGEX.test(`${_optionalChain([node, 'access', _2 => _2.extra, 'optionalAccess', _3 => _3.raw])}`)) {
     return "";
   }
   let value = node.value;
@@ -103,27 +99,26 @@ function resolveJSXText(node) {
   return value;
 }
 function isEmptyText(node) {
-  return node.type === "JSXText" && EMPTY_TEXT_REGEX.test(`${_optionalChain([node, 'access', _5 => _5.extra, 'optionalAccess', _6 => _6.raw])}`) || node.type === "JSXExpressionContainer" && node.expression.type === "JSXEmptyExpression";
+  return node.type === "JSXText" && EMPTY_TEXT_REGEX.test(`${_optionalChain([node, 'access', _4 => _4.extra, 'optionalAccess', _5 => _5.raw])}`) || node.type === "JSXExpressionContainer" && node.expression.type === "JSXEmptyExpression";
 }
 function resolveExpression(node, context, effect = false) {
+  node = _optionalChain([node, 'optionalAccess', _6 => _6.type]) === "JSXExpressionContainer" ? node.expression : node;
   const isStatic = !!node && (node.type === "StringLiteral" || node.type === "JSXText" || node.type === "JSXIdentifier");
-  let source = !node ? "" : node.type === "JSXIdentifier" ? node.name : node.type === "StringLiteral" ? node.value : node.type === "JSXText" ? resolveJSXText(node) : node.type === "JSXExpressionContainer" ? node.expression.type === "JSXEmptyExpression" ? "" : node.expression.type === "Identifier" ? node.expression.name : context.ir.source.slice(
-    node.expression.start,
-    node.expression.end
-  ) : context.ir.source.slice(node.start, node.end);
+  let source = !node || node.type === "JSXEmptyExpression" ? "" : node.type === "JSXIdentifier" ? node.name : node.type === "StringLiteral" ? node.value : node.type === "JSXText" ? resolveJSXText(node) : node.type === "Identifier" ? node.name : context.ir.source.slice(node.start, node.end);
   const location = node ? node.loc : null;
-  if (source && !isStatic && effect && !isLiteralExpressionContainer(node)) {
+  let ast;
+  if (source && !isStatic && effect && !isConstant(node)) {
     source = `() => (${source})`;
   }
-  return resolveSimpleExpression(source, isStatic, location);
+  return resolveSimpleExpression(source, isStatic, location, ast);
 }
-function resolveSimpleExpression(source, isStatic, location) {
+function resolveSimpleExpression(source, isStatic, location, ast) {
   const result = _compilerdom.createSimpleExpression.call(void 0, 
     source,
     isStatic,
     resolveLocation(location, source)
   );
-  result.ast = null;
+  result.ast = _nullishCoalesce(ast, () => ( null));
   return result;
 }
 function resolveLocation(location, context) {
@@ -417,24 +412,21 @@ var TransformContext = class _TransformContext {
     if (this.inVOnce || expressions.length === 0) {
       return this.registerOperation(...operations);
     }
-    const ids = /* @__PURE__ */ new Set();
-    expressions.forEach((exp) => extractIdentifiers(ids, exp));
     const existing = this.block.effect.find(
-      (e) => _shared.looseEqual.call(void 0, e.identifiers, Array.from(ids))
+      (e) => isSameExpression(e.expressions, expressions)
     );
     if (existing) {
       existing.operations.push(...operations);
     } else {
       this.block.effect.push({
         expressions,
-        operations,
-        earlyCheckExps: [],
-        declareNames: /* @__PURE__ */ new Set(),
-        rewrittenNames: /* @__PURE__ */ new Set(),
-        inVFor: this.inVFor > 0,
-        identifiers: Array.from(ids)
+        operations
       });
     }
+    function isSameExpression(a, b) {
+      if (a.length !== b.length) return false;
+      return a.every((exp, i) => exp.content === b[i].content);
+    }
   }
   registerOperation(...node) {
     this.block.operation.push(...node);
@@ -492,13 +484,6 @@ function transformNode(context) {
     context.registerTemplate();
   }
 }
-function extractIdentifiers(ids, node) {
-  if (node.ast) {
-    _compilerdom.walkIdentifiers.call(void 0, node.ast, (n) => ids.add(n.name), true);
-  } else if (node.ast === null) {
-    ids.add(node.content);
-  }
-}
 
 // src/transforms/transformElement.ts
 
@@ -1307,10 +1292,6 @@ var transformVHtml = (dir, node, context) => {
 function compile(source, options = {}) {
   const onError = options.onError || _compilerdom.defaultOnError;
   const isModuleMode = options.mode === "module";
-  const __BROWSER__3 = false;
-  if (__BROWSER__3 && isModuleMode) {
-    onError(_compilerdom.createCompilerError.call(void 0, _compilerdom.ErrorCodes.X_MODULE_MODE_NOT_SUPPORTED));
-  }
   if (options.scopeId && !isModuleMode) {
     onError(_compilerdom.createCompilerError.call(void 0, _compilerdom.ErrorCodes.X_SCOPE_ID_NOT_SUPPORTED));
   }
@@ -1318,7 +1299,7 @@ function compile(source, options = {}) {
     prefixIdentifiers: false,
     expressionPlugins: options.expressionPlugins || ["jsx"]
   });
-  if (!__BROWSER__3 && options.isTS) {
+  if (options.isTS) {
     const { expressionPlugins } = resolvedOptions;
     if (!expressionPlugins.includes("typescript")) {
       resolvedOptions.expressionPlugins = [
@@ -1327,21 +1308,25 @@ function compile(source, options = {}) {
       ];
     }
   }
-  const {
-    body: [statement]
-  } = _shared.isString.call(void 0, source) ? _parser.parse.call(void 0, source, {
-    sourceType: "module",
-    plugins: resolvedOptions.expressionPlugins
-  }).program : source;
-  let children;
-  if (statement.type === "ExpressionStatement") {
-    children = statement.expression.type === "JSXFragment" ? statement.expression.children : statement.expression.type === "JSXElement" ? [statement.expression] : [];
+  let expression;
+  if (_shared.isString.call(void 0, source)) {
+    const {
+      body: [statement]
+    } = _parser.parse.call(void 0, source, {
+      sourceType: "module",
+      plugins: resolvedOptions.expressionPlugins
+    }).program;
+    if (statement.type === "ExpressionStatement") {
+      expression = statement.expression;
+    }
+  } else {
+    expression = source;
   }
+  const children = expression.type === "JSXFragment" ? expression.children : expression.type === "JSXElement" ? [expression] : [];
   const ast = {
     type: 0 /* ROOT */,
     children,
-    source: _shared.isString.call(void 0, source) ? source : "",
-    // TODO
+    source: _shared.isString.call(void 0, source) ? source : options.source || "",
     components: [],
     directives: [],
     helpers: /* @__PURE__ */ new Set(),

package/dist/index.d.cts

@@ -2,7 +2,7 @@ import { IRFor as IRFor$1, VaporCodegenResult as VaporCodegenResult$1 } from '@v
 export { generate } from '@vue/compiler-vapor';
 import { SimpleExpressionNode, BindingTypes, DirectiveNode, CompoundExpressionNode, TransformOptions as TransformOptions$1, CompilerCompatOptions, CommentNode, CompilerOptions as CompilerOptions$1, ElementNode } from '@vue/compiler-dom';
 import * as _vue_runtime_vapor from '@vue/runtime-vapor';
-import { JSXFragment, Node, JSXAttribute, JSXElement, Program } from '@babel/types';
+import { JSXFragment, Node, JSXAttribute, JSXElement } from '@babel/types';
 import { Prettify } from '@vue/shared';
 
 interface IRProp extends Omit<DirectiveTransformResult, 'value'> {
@@ -272,12 +272,7 @@ interface IRDynamicInfo {
 }
 interface IREffect {
     expressions: SimpleExpressionNode[];
-    identifiers: string[];
     operations: OperationNode[];
-    declareNames: Set<string>;
-    rewrittenNames: Set<string>;
-    earlyCheckExps: string[];
-    inVFor: boolean;
 }
 type Overwrite<T, U> = Pick<T, Exclude<keyof T, keyof U>> & Pick<U, Extract<keyof U, keyof T>>;
 type HackOptions<T> = Prettify<Overwrite<T, {
@@ -335,8 +330,10 @@ declare function transformNode(context: TransformContext<BlockIRNode['node']>):
 interface VaporCodegenResult extends Omit<VaporCodegenResult$1, 'ast'> {
     ast: RootIRNode;
 }
-declare function compile(source: string | Program, options?: CompilerOptions): VaporCodegenResult;
-type CompilerOptions = HackOptions<CompilerOptions$1>;
+declare function compile(source: string | JSXElement | JSXFragment, options?: CompilerOptions): VaporCodegenResult;
+type CompilerOptions = HackOptions<CompilerOptions$1> & {
+    source?: string;
+};
 type TransformPreset = [
     NodeTransform[],
     Record<string, DirectiveTransform>

package/dist/index.d.ts

@@ -2,7 +2,7 @@ import { IRFor as IRFor$1, VaporCodegenResult as VaporCodegenResult$1 } from '@v
 export { generate } from '@vue/compiler-vapor';
 import { SimpleExpressionNode, BindingTypes, DirectiveNode, CompoundExpressionNode, TransformOptions as TransformOptions$1, CompilerCompatOptions, CommentNode, CompilerOptions as CompilerOptions$1, ElementNode } from '@vue/compiler-dom';
 import * as _vue_runtime_vapor from '@vue/runtime-vapor';
-import { JSXFragment, Node, JSXAttribute, JSXElement, Program } from '@babel/types';
+import { JSXFragment, Node, JSXAttribute, JSXElement } from '@babel/types';
 import { Prettify } from '@vue/shared';
 
 interface IRProp extends Omit<DirectiveTransformResult, 'value'> {
@@ -272,12 +272,7 @@ interface IRDynamicInfo {
 }
 interface IREffect {
     expressions: SimpleExpressionNode[];
-    identifiers: string[];
     operations: OperationNode[];
-    declareNames: Set<string>;
-    rewrittenNames: Set<string>;
-    earlyCheckExps: string[];
-    inVFor: boolean;
 }
 type Overwrite<T, U> = Pick<T, Exclude<keyof T, keyof U>> & Pick<U, Extract<keyof U, keyof T>>;
 type HackOptions<T> = Prettify<Overwrite<T, {
@@ -335,8 +330,10 @@ declare function transformNode(context: TransformContext<BlockIRNode['node']>):
 interface VaporCodegenResult extends Omit<VaporCodegenResult$1, 'ast'> {
     ast: RootIRNode;
 }
-declare function compile(source: string | Program, options?: CompilerOptions): VaporCodegenResult;
-type CompilerOptions = HackOptions<CompilerOptions$1>;
+declare function compile(source: string | JSXElement | JSXFragment, options?: CompilerOptions): VaporCodegenResult;
+type CompilerOptions = HackOptions<CompilerOptions$1> & {
+    source?: string;
+};
 type TransformPreset = [
     NodeTransform[],
     Record<string, DirectiveTransform>

package/dist/index.js

@@ -16,10 +16,9 @@ import { parse } from "@babel/parser";
 // src/transform.ts
 import {
   defaultOnError,
-  defaultOnWarn,
-  walkIdentifiers
+  defaultOnWarn
 } from "@vue/compiler-dom";
-import { EMPTY_OBJ, NOOP, extend, isArray, looseEqual } from "@vue/shared";
+import { EMPTY_OBJ, NOOP, extend, isArray } from "@vue/shared";
 
 // src/transforms/utils.ts
 import {
@@ -83,9 +82,6 @@ var isConstant = (node) => {
   }
   return false;
 };
-function isLiteralExpressionContainer(node) {
-  return node?.type === "JSXExpressionContainer" && node.expression.type !== "JSXEmptyExpression" && isConstant(node.expression);
-}
 var EMPTY_TEXT_REGEX = /^\s*[\n\r]\s*$/;
 var START_EMPTY_TEXT_REGEX = /^\s*[\n\r]/;
 var END_EMPTY_TEXT_REGEX = /[\n\r]\s*$/;
@@ -106,24 +102,23 @@ function isEmptyText(node) {
   return node.type === "JSXText" && EMPTY_TEXT_REGEX.test(`${node.extra?.raw}`) || node.type === "JSXExpressionContainer" && node.expression.type === "JSXEmptyExpression";
 }
 function resolveExpression(node, context, effect = false) {
+  node = node?.type === "JSXExpressionContainer" ? node.expression : node;
   const isStatic = !!node && (node.type === "StringLiteral" || node.type === "JSXText" || node.type === "JSXIdentifier");
-  let source = !node ? "" : node.type === "JSXIdentifier" ? node.name : node.type === "StringLiteral" ? node.value : node.type === "JSXText" ? resolveJSXText(node) : node.type === "JSXExpressionContainer" ? node.expression.type === "JSXEmptyExpression" ? "" : node.expression.type === "Identifier" ? node.expression.name : context.ir.source.slice(
-    node.expression.start,
-    node.expression.end
-  ) : context.ir.source.slice(node.start, node.end);
+  let source = !node || node.type === "JSXEmptyExpression" ? "" : node.type === "JSXIdentifier" ? node.name : node.type === "StringLiteral" ? node.value : node.type === "JSXText" ? resolveJSXText(node) : node.type === "Identifier" ? node.name : context.ir.source.slice(node.start, node.end);
   const location = node ? node.loc : null;
-  if (source && !isStatic && effect && !isLiteralExpressionContainer(node)) {
+  let ast;
+  if (source && !isStatic && effect && !isConstant(node)) {
     source = `() => (${source})`;
   }
-  return resolveSimpleExpression(source, isStatic, location);
+  return resolveSimpleExpression(source, isStatic, location, ast);
 }
-function resolveSimpleExpression(source, isStatic, location) {
+function resolveSimpleExpression(source, isStatic, location, ast) {
   const result = createSimpleExpression(
     source,
     isStatic,
     resolveLocation(location, source)
   );
-  result.ast = null;
+  result.ast = ast ?? null;
   return result;
 }
 function resolveLocation(location, context) {
@@ -417,24 +412,21 @@ var TransformContext = class _TransformContext {
     if (this.inVOnce || expressions.length === 0) {
       return this.registerOperation(...operations);
     }
-    const ids = /* @__PURE__ */ new Set();
-    expressions.forEach((exp) => extractIdentifiers(ids, exp));
     const existing = this.block.effect.find(
-      (e) => looseEqual(e.identifiers, Array.from(ids))
+      (e) => isSameExpression(e.expressions, expressions)
     );
     if (existing) {
       existing.operations.push(...operations);
     } else {
       this.block.effect.push({
         expressions,
-        operations,
-        earlyCheckExps: [],
-        declareNames: /* @__PURE__ */ new Set(),
-        rewrittenNames: /* @__PURE__ */ new Set(),
-        inVFor: this.inVFor > 0,
-        identifiers: Array.from(ids)
+        operations
       });
     }
+    function isSameExpression(a, b) {
+      if (a.length !== b.length) return false;
+      return a.every((exp, i) => exp.content === b[i].content);
+    }
   }
   registerOperation(...node) {
     this.block.operation.push(...node);
@@ -492,13 +484,6 @@ function transformNode(context) {
     context.registerTemplate();
   }
 }
-function extractIdentifiers(ids, node) {
-  if (node.ast) {
-    walkIdentifiers(node.ast, (n) => ids.add(n.name), true);
-  } else if (node.ast === null) {
-    ids.add(node.content);
-  }
-}
 
 // src/transforms/transformElement.ts
 import { extend as extend2, isBuiltInDirective, isVoidTag, makeMap as makeMap2 } from "@vue/shared";
@@ -1307,10 +1292,6 @@ var transformVHtml = (dir, node, context) => {
 function compile(source, options = {}) {
   const onError = options.onError || defaultOnError2;
   const isModuleMode = options.mode === "module";
-  const __BROWSER__3 = false;
-  if (__BROWSER__3 && isModuleMode) {
-    onError(createCompilerError2(ErrorCodes2.X_MODULE_MODE_NOT_SUPPORTED));
-  }
   if (options.scopeId && !isModuleMode) {
     onError(createCompilerError2(ErrorCodes2.X_SCOPE_ID_NOT_SUPPORTED));
   }
@@ -1318,7 +1299,7 @@ function compile(source, options = {}) {
     prefixIdentifiers: false,
     expressionPlugins: options.expressionPlugins || ["jsx"]
   });
-  if (!__BROWSER__3 && options.isTS) {
+  if (options.isTS) {
     const { expressionPlugins } = resolvedOptions;
     if (!expressionPlugins.includes("typescript")) {
       resolvedOptions.expressionPlugins = [
@@ -1327,21 +1308,25 @@ function compile(source, options = {}) {
       ];
     }
   }
-  const {
-    body: [statement]
-  } = isString2(source) ? parse(source, {
-    sourceType: "module",
-    plugins: resolvedOptions.expressionPlugins
-  }).program : source;
-  let children;
-  if (statement.type === "ExpressionStatement") {
-    children = statement.expression.type === "JSXFragment" ? statement.expression.children : statement.expression.type === "JSXElement" ? [statement.expression] : [];
+  let expression;
+  if (isString2(source)) {
+    const {
+      body: [statement]
+    } = parse(source, {
+      sourceType: "module",
+      plugins: resolvedOptions.expressionPlugins
+    }).program;
+    if (statement.type === "ExpressionStatement") {
+      expression = statement.expression;
+    }
+  } else {
+    expression = source;
   }
+  const children = expression.type === "JSXFragment" ? expression.children : expression.type === "JSXElement" ? [expression] : [];
   const ast = {
     type: 0 /* ROOT */,
     children,
-    source: isString2(source) ? source : "",
-    // TODO
+    source: isString2(source) ? source : options.source || "",
     components: [],
     directives: [],
     helpers: /* @__PURE__ */ new Set(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-jsx-vapor/compiler",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Vue JSX Vapor Compiler",
   "type": "module",
   "keywords": [
@@ -51,11 +51,11 @@
     "@babel/parser": "^7.26.7",
     "@babel/types": "^7.26.7",
     "@vue-macros/common": "^1.10.4",
-    "@vue/compiler-core": "https://pkg.pr.new/vuejs/vue-vapor/@vue/compiler-core@9f73dbf",
-    "@vue/compiler-dom": "https://pkg.pr.new/vuejs/vue-vapor/@vue/compiler-dom@9f73dbf",
-    "@vue/compiler-vapor": "https://pkg.pr.new/vuejs/vue-vapor/@vue/compiler-vapor@9f73dbf",
-    "@vue/runtime-vapor": "https://pkg.pr.new/vuejs/vue-vapor/@vue/runtime-vapor@9f73dbf",
-    "@vue/shared": "https://pkg.pr.new/vuejs/vue-vapor/@vue/shared@9f73dbf"
+    "@vue/compiler-core": "https://pkg.pr.new/vuejs/vue-vapor/@vue/compiler-core@6d5bc43",
+    "@vue/compiler-dom": "https://pkg.pr.new/vuejs/vue-vapor/@vue/compiler-dom@6d5bc43",
+    "@vue/compiler-vapor": "https://pkg.pr.new/vuejs/vue-vapor/@vue/compiler-vapor@6d5bc43",
+    "@vue/runtime-vapor": "https://pkg.pr.new/vuejs/vue-vapor/@vue/runtime-vapor@6d5bc43",
+    "@vue/shared": "https://pkg.pr.new/vuejs/vue-vapor/@vue/shared@6d5bc43"
   },
   "scripts": {
     "build": "tsup",