@shijiu/jsview 1.9.921 → 1.9.943-next-vue.0

package/patches/node_modules/@vue/runtime-dom/dist/runtime-dom.esm-bundler.js

@@ -333,6 +333,23 @@ function parseName(name) {
             options[m[0].toLowerCase()] = true;
         }
     }
+// JsView Added >>>
+// 处理自定义的 addEventListener() options, 前缀为jsv
+// onJsvXxx留给自定义Event，这样判断防止出现下面写法
+// :jsvevent.jsvoption1.jsvoption2 => onJsvEventJsvOption1JsvOption2
+    if (name.lastIndexOf('Jsv') > 2) {
+        options = options ?? {};
+
+        const optNames = name.substring(3); // 过滤掉jsvEvent
+        const optArray = optNames.split('Jsv');
+        // optArray[0] 为EventName部分内容
+        for (let idx = optArray.length - 1; idx > 0; idx--) {
+            const optName = 'jsv' + optArray[idx];
+            options[optName] = true;
+            name = name.slice(0, name.length - optName.length);
+        }
+    }
+// JsView Added <<<
     const event = name[2] === ':' ? name.slice(3) : hyphenate(name.slice(2));
     return [event, options];
 }

package/patches/node_modules/postcss-js/objectifier.js

@@ -3,10 +3,10 @@ let camelcase = require('camelcase-css')
 let UNITLESS = {
 // JsView Added >>>
 // 添加将px转为int的属性，用于Css转为Js。
+  height: true,
   left: true,
   top: true,
   width: true,
-  height: true,
 // JsView Added <<<
 
   boxFlex: true,

package/patches/node_modules/vite/dist/node/jsview-vite-extension.js

@@ -34,8 +34,8 @@ const jsviewConfig = defineConfig({
           'export-sfc': ['\0plugin-vue:export-helper'], // 将_export_sfc独立出来，防止被集成在jsview-vue中导致import deadloop.
           'vue': ['vue'], // 将vue独立出来，防止被集成在main.js中导致import deadloop.
           // 将dom-entry和forge-define分割出来，防止被集成在main.js中导致import deadloop.
-          'forge-define': ['@shijiu/jsview/dom/jsv-forge-define.mjs'],
-          'jsivew-dom-entry': ['@shijiu/jsview/dom/index.mjs'], 
+          // 'forge-define': ['@shijiu/jsview/dom/jsv-forge-define.mjs'],
+          // 'jsivew-dom-entry': ['@shijiu/jsview/dom/index.mjs'], 
         },
       },
     },

package/tools/jsview-batch-upgrade.mjs

@@ -176,15 +176,45 @@ function upgradeStagePixel(options) {
   // 过滤 (+ px), (+ 'px'), (+ "px"), (+ `px`), ( + ' px ') 等
   replaceStageContent(options, options.sourcePathList, msgPrefix,
                       / *\+ ['"`]* *px *['"`]*/g, '');
-  // 过滤 (00px), ('00px'), ("00px"), (`00px`), ('00px') 等
-  replaceStageContent(options, options.sourcePathList, msgPrefix,
-                      /['"`]*([0-9]+)px['"`]*/g, '$1');
   // 过滤 (' 00px '), (" 00px "), (` 00px `), ('00px ') 等
   replaceStageContent(options, options.sourcePathList, msgPrefix,
-                      /['"`] *([0-9]+)px *['"`]/g, '$1');
+                      /' *([0-9]+)px *'/g, '$1');
+  replaceStageContent(options, options.sourcePathList, msgPrefix,
+                      /" *([0-9]+)px *"/g, '$1');
+  replaceStageContent(options, options.sourcePathList, msgPrefix,
+                      /` *([0-9]+)px *`/g, '$1');
   // 过滤 ('${00}px'), ("${00}px"), (`${00}px`), ( ' ${00}px ') 等
   replaceStageContent(options, options.sourcePathList, msgPrefix,
                       /['"`]*(\${.*?})px *['"`]*/g, '$1');
+  // 过滤 (00px), ('00px'), ("00px"), (`00px`), ('00px') 等
+  replaceStageContent(options, options.sourcePathList, msgPrefix,
+                      /'([0-9]+)px'/g, '$1');
+  replaceStageContent(options, options.sourcePathList, msgPrefix,
+                      /"([0-9]+)px"/g, '$1');
+  replaceStageContent(options, options.sourcePathList, msgPrefix,
+                      /`([0-9]+)px`/g, '$1');
+  replaceStageContent(options, options.sourcePathList, msgPrefix,
+                      /([0-9]+)px/g, '$1');
+
+  const numberStyleList = [
+    'height',
+    'left',
+    'top',
+    'width',
+
+    'borderRadius',
+
+    'fontSize',
+    'lineHeight',
+  ];
+
+  for (const numberStyle of numberStyleList) {
+    const regExp = new RegExp(`:${numberStyle}=['"\`] *([0-9]+) *['"\`]`, 'g');
+    const toValue = `:${numberStyle}=$1`;
+
+    replaceStageContent(options, options.sourcePathList, msgPrefix,
+                        regExp, toValue);
+  }
 
   return;
 }
@@ -242,7 +272,12 @@ function upgradeStageImportPostfix(options)
 
     let fixedContent = content;
 
-    const importFilePath = path.resolve(currentDir, importFromFile);
+    let importFilePath = null;
+    if (importFromFile.startsWith('@')) {
+      importFilePath = path.resolve(options.rootDir, 'src', importFromFile.replace('@/', ''));
+    } else {
+      importFilePath = path.resolve(currentDir, importFromFile);
+    }
     if (fs.existsSync(importFilePath + '.js')) {
       // 执行到此处，则需要给给import的文件加上js尾缀。当同时存在.js和.vue时，.js优先。
       fixedContent = content.replace(importFromFile, importFromFile + '.js');

package/tools/jsview-post-install.mjs

@@ -197,6 +197,8 @@ function main(argv)
   switch (argv.framework) {
     case 'vue':
       pkgNeedPatch = [
+        '@vitejs/plugin-vue',
+        '@vue/compiler-dom',
         '@vue/compiler-sfc',
         '@vue/runtime-core',
         '@vue/runtime-dom',

package/patches/node_modules/@vue/compiler-sfc/dist/jsview-style-format.js

@@ -1,201 +0,0 @@
-const { StyleName, StyleVariable } = require("./jsview-style-types");
-
-class StyleConverter {
-  static ToInteger(value) {
-    if (StyleVariable.IsVariable(value)) {
-      return value;
-    }
-
-    if (!value) {
-      return value;
-    }
-    if (typeof value !== "string") {
-      return Math.floor(value);
-    }
-
-    value = StyleConverter.ExecIfCalc(value);
-    const ret = parseInt(value);
-    if (ret != value && value.endsWith('px') == false) {
-      throw Error("Bad unit in value " + value);
-    }
-    return ret;
-  }
-
-  static ToFloat(value) {
-    if (StyleVariable.IsVariable(value)) {
-      return value;
-    }
-
-    if (!value) {
-       return value;
-    }
-    if (typeof value !== "string") {
-      return value;
-    }
-
-    value = StyleConverter.ExecIfCalc(value);
-    let ret = parseFloat(value);
-    return ret;
-  }
-
-  static ToString(value) {
-    if (StyleVariable.IsVariable(value)) {
-      return value;
-    }
-
-    if (!value) {
-      return "";
-    }
-
-    value = StyleConverter.ExecIfCalc(value);
-    return value;
-  }
-
-  static ExecIfCalc(value) {
-    if (typeof value !== "string") {
-      return value;
-    }
-
-    const isCalc = (value.startsWith("calc("));
-    if (!isCalc) {
-      return value;
-    }
-
-    const expr = value.replace(/calc(\(.*\))/, '$1')
-    let ret = null;
-    try {
-      ret = eval(expr);
-    } catch (ex) {
-      console.error("Failed to exec StyleConverter.ExecIfCalc(" + value + ")");
-      throw ex;
-    }
-
-    console.log('execIfCalc() value=', value, " ret=", ret);
-    return ret;
-  }
-
-}
-
-class StyleFormatter {
-  static GetFormattedValue(propName, propValue) {
-    let formattedValue = propValue;
-
-    switch (propName) {
-      case StyleName.Layout.Height:
-      case StyleName.Layout.Left:
-      case StyleName.Layout.Top:
-      case StyleName.Layout.Width:
-        formattedValue = StyleFormatter.#GetLayoutValue(propName, propValue);
-        break;
-      case StyleName.Background.BackgroundColor:
-      case StyleName.Background.BackgroundImage:
-      case StyleName.Background.BorderRadius:
-        formattedValue = StyleFormatter.#GetBackgroundValue(propName, propValue);
-        break;
-      case StyleName.Effect.BackfaceVisibility:
-      case StyleName.Effect.BorderImage:
-      case StyleName.Effect.BorderImageWidth:
-      case StyleName.Effect.BorderImageOutset:
-      case StyleName.Effect.ClipPath:
-      case StyleName.Effect.Display:
-      case StyleName.Effect.ObjectFit:
-      case StyleName.Effect.Opacity:
-      case StyleName.Effect.Overflow:
-      case StyleName.Effect.Perspective:
-      case StyleName.Effect.PerspectiveOrigin:
-      case StyleName.Effect.Visibility:
-      case StyleName.Effect.ZIndex:
-        formattedValue = StyleFormatter.#GetEffectValue(propName, propValue);
-        break;
-      case StyleName.Text.Color:
-      case StyleName.Text.FontFamily:
-      case StyleName.Text.FontSize:
-      case StyleName.Text.FontStyle:
-      case StyleName.Text.FontWeight:
-      case StyleName.Text.LineHeight:
-      case StyleName.Text.TextAlign:
-      case StyleName.Text.TextShadow:
-      case StyleName.Text.TextOverflow:
-      case StyleName.Text.Transform:
-      case StyleName.Text.TransformOrigin:
-      case StyleName.Text.TransformStyle:
-      case StyleName.Text.WebkitTextStroke:
-      case StyleName.Text.WhiteSpace:
-      case StyleName.Text.WordWrap:
-        formattedValue = StyleFormatter.#GetTextValue(propName, propValue);
-        break;
-      case StyleName.Motion.Animation:
-      case StyleName.Motion.Transition:
-        formattedValue = StyleFormatter.#GetMotionValue(propName, propValue);
-        break;
-      default:
-        // 返回未处理的值
-        console.warn("JsView Warn: Unimplemented style property [" + propName + "]");
-        break;
-    }
-
-    return formattedValue;
-  }
-
-  static #GetLayoutValue(propName, propValue) {
-    const formattedValue = StyleConverter.ToInteger(propValue);
-
-    return formattedValue;
-  }
-
-  static #GetBackgroundValue(propName, propValue) {
-    let formattedValue = null;
-    switch (propName) {
-      default:
-        formattedValue = StyleConverter.ToString(propValue);
-        break;
-    }
-
-    return formattedValue;
-  }
-
-  static #GetEffectValue(propName, propValue) {
-    let formattedValue = null;
-    switch (propName) {
-      case StyleName.Effect.ClipPath:
-      case StyleName.Effect.Display:
-      case StyleName.Effect.Overflow:
-      case StyleName.Effect.Visibility:
-        formattedValue = StyleConverter.ToString(propValue);
-        break;
-      case StyleName.Effect.Opacity:
-        formattedValue = StyleConverter.ToFloat(propValue);
-        break;
-      default:
-        formattedValue = StyleConverter.ToInteger(propValue);
-        break;
-    }
-
-    return formattedValue;
-  }
-
-  static #GetTextValue(propName, propValue) {
-    let formattedValue = null;
-    switch (propName) {
-      case StyleName.Text.FontSize:
-      case StyleName.Text.LineHeight:
-        formattedValue = StyleConverter.ToInteger(propValue);
-        break;
-      default:
-        formattedValue = StyleConverter.ToString(propValue);
-        break;
-    }
-
-    return formattedValue;
-  }
-
-  static #GetMotionValue(propName, propValue) {
-    // 需要留到执行时处理
-    const formattedValue = StyleConverter.ToString(propValue);
-
-    return formattedValue;
-  }
-
-}
-
-exports.getFormattedValue = StyleFormatter.GetFormattedValue;

package/patches/node_modules/@vue/compiler-sfc/dist/jsview-style-types.js

@@ -1,83 +0,0 @@
-class StyleName {
-  static Layout = class {
-    static Height = "height";
-    static Left = "left";
-    static Top = "top";
-    static Width = "width";
-
-    constructor() { throw new Error("new StyleName.Layout() is forbidden."); }
-  }
-
-  static Background = class {
-    static BackgroundColor = "backgroundColor";
-    static BackgroundImage = "backgroundImage";
-    static BorderRadius = "borderRadius";
-
-    constructor() { throw new Error("new StyleName.Background() is forbidden."); }
-  }
-
-  static Effect = class {
-    static BackfaceVisibility = "backfaceVisibility";
-    static BorderImage = "borderImage";
-    static BorderImageWidth = "borderImageWidth";
-    static BorderImageOutset = "borderImageOutset";
-    static ClipPath = "clipPath";
-    static Display = "display";
-    static ObjectFit = "objectFit";
-    static Opacity = "opacity";
-    static Overflow = "overflow";
-    static Perspective = "perspective";
-    static PerspectiveOrigin = "perspectiveOrigin";
-    static Transform = "transform";
-    static TransformOrigin = "transformOrigin";
-    static TransformStyle = "transformStyle";
-    static Visibility = "visibility";
-    static ZIndex = "zIndex";
-
-    constructor() { throw new Error("new StyleName.Effect() is forbidden."); }
-  }
-
-  static Text = class {
-    static Color = "color";
-    static FontFamily = "fontFamily";
-    static FontSize = "fontSize";
-    static FontStyle = "fontStyle";
-    static FontWeight = "fontWeight";
-    static LineHeight = "lineHeight";
-    static TextAlign = "textAlign";
-    static TextOverflow = "textOverflow";
-    static TextShadow = "textShadow";
-    static Transform = "transform";
-    static TransformOrigin = "transformOrigin";
-    static TransformStyle = "transformStyle";
-    static WebkitTextStroke = "WebkitTextStroke";
-    static WhiteSpace = "whiteSpace";
-    static WordWrap = "wordWrap";
-    static JsvTextEmoji = "JsvTextEmoji";
-
-    constructor() { throw new Error("new StyleName.Text() is forbidden."); }
-  }
-
-  static Motion = class {
-    static Animation = "animation";
-    static Transition = "transition";
-
-    constructor() { throw new Error("new StyleName.Motion() is forbidden."); }
-  }
-
-  constructor() { throw new Error("new StyleName() is forbidden."); }
-}
-
-class StyleVariable {
-  static IsVariable(value) {
-    let variable = value.toString();
-
-    const isVar = (variable.startsWith("--") || variable.startsWith("var(--"));
-    return isVar;
-  }
-
-  constructor() { throw new Error("new StyleVariable() is forbidden."); }
-}
-
-exports.StyleName = StyleName;
-exports.StyleVariable = StyleVariable;