@shijiu/jsview 2.1.482-test.0 → 2.2.128

package/dom/bin/jsview-forge-define.min.js

@@ -1,2 +1,2 @@
-/* eslint-disable */ void 0===window.Forge?(window.Forge={},console.log("Define forge browser")):console.log("Define using JsView forge engine-js");var e=window.Forge;class t{constructor(e,t){if(this.href="",this.origin="",this.protocol="",this.host="",this.hostname="",this.port="",this.pathname="",this.search="",this.hash="",!e)return;if(!0===e.startsWith("url")){let t=e.indexOf("(")+1,i=e.lastIndexOf(")");if("undefined"===(e=e.substring(t,i).trim())||"null"===e||0===e.length)return}if(!0===e.startsWith("data:")||!0===e.startsWith("jsvtexturestore:"))return void(this.href=e);let i=e.indexOf("://");if(!(i<0||i>10)||e.startsWith("./")||e.startsWith("/")||(e="./"+e),!0===e.startsWith("/"))e=document.location.origin+e;else if(!0===e.startsWith("./")&&void 0!==window.JsView&&void 0!==window.JsView.Dom.JsSubPath){if(void 0===window.JsView.Dom.MainPath||"undefined"===window.JsView.Dom.MainPathRef||window.JsView.Dom.MainPathRef!==document.location.href){window.JsView.Dom.JsSubPath.startsWith("/")||(window.JsView.Dom.JsSubPath="/"+window.JsView.Dom.JsSubPath),window.JsView.Dom.JsSubPath.endsWith("/")||(window.JsView.Dom.JsSubPath=window.JsView.Dom.JsSubPath+"/"),window.JsView.Dom.MainPathRef=document.location.href;let e=document.location.pathname.lastIndexOf(window.JsView.Dom.JsSubPath);window.JsView.Dom.MainPath=document.location.origin+document.location.pathname.substring(0,e)}e=window.JsView.Dom.MainPath+e.substring(1)}if(this.href=e,!t)return;let o=this.href,n=o.indexOf("#");n>0&&(this.hash=o.substring(n),o=o.substring(0,n));let s=o.indexOf("?");s>1&&(this.search=o.substring(s),o=o.substring(0,s));let r=o,a=r.indexOf("://");this.protocol=a>0?r.substring(0,a+1):"";let h=a>1?r.substring(a+3):"";a=h.indexOf("/"),this.host=a>0?h.substring(0,a):"",this.pathname=a>=1?h.substring(a):"","file:"==this.protocol&&(this.host="",this.pathname=h),this.origin=this.protocol+"//"+this.host,a=this.host.indexOf(":"),this.hostname=a>0?this.host.substring(0,a):this.host,this.port=a>1?this.host.substring(a+1):""}replace(e){this.href=e}}class i{static SetBackgroundColor(t,i,o){const n=window.JsvCode.ForgeHandles.TextureManager.GetColorTextureCached(i);let s;o&&(s=new e.ViewRoundCornerMask(o.topLeft,o.topRight,o.bottomLeft,o.bottomRight));const r=new e.ExternalTextureSetting(n,s);t.ResetTexture(r)}static SetBackgroundImage(i,o,n,s,r,a,h){let d,l={};if("string"==typeof o){const e=new t(o);if(e instanceof t==!1)throw Error("Bad Argument.",e);l.url=e.href}else"linear-gradient"==o?.type&&(l.gradient=o);if(l.gradient)if(l.gradient.colors?.length>2){const e=l.gradient.colors,t=[e[0],e[e.length-1]],i=e.slice(1,e.length-1);d=window.JsvCode.ForgeHandles.TextureManager.CreateLinearGradientTexture(t,i)}else 2==l.gradient.colors?.length?d=window.JsvCode.ForgeHandles.TextureManager.CreateMiniGradientTexture(!0,l.gradient.colors[0],l.gradient.colors[1],l.gradient.rawValue):console.warn("Failed to create backgroundImage gradient, bad colors.",l.gradient.colors);else l.url&&(d=l.url.includes(".gif")||l.url.includes(".webp")?window.JsvCode.ForgeHandles.TextureManager.GetGifImage(l.url,!1,null,h):window.JsvCode.ForgeHandles.TextureManager.GetImage2(l.url,!1,r,a||e.ColorSpace.RGBA_8888));if(d){let t;n&&(t=new e.ViewRoundCornerMask(n.topLeft,n.topRight,n.bottomLeft,n.bottomRight));const o=new e.ExternalTextureSetting(d,t);if(i.ResetTexture(o),s){let e=d.RegisterLoadImageCallback(null,(function(){s({width:d.Width,height:d.Height})}));i.RegisterDetachCallback((()=>{d.UnregisterLoadImageCallback(e)}))}}}static SetMaskedBackgroundImage(i,o,n,s){if("string"==typeof o&&(o=new t(o)),o instanceof t==!1)throw Error("Bad Argument.",o);if("string"==typeof n&&(n=new t(n)),n instanceof t==!1)throw Error("Bad Argument(MaskURL).",n);const r=window.JsvCode.ForgeHandles.TextureManager.GetImage2(o.href,!1,null,s||e.ColorSpace.RGBA_8888);if(r){const t=window.JsvCode.ForgeHandles.TextureManager.GetImage2(n.href,!1,null,e.ColorSpace.RGBA_8888),o=new e.ExternalTextureSetting(r,new e.ViewTextureMask(t));i.ResetTexture(o)}}}export{e as Forge,i as ForgeExtension};
+/* eslint-disable */ void 0===window.Forge?(window.Forge={},console.log("Define forge browser")):console.log("Define using JsView forge engine-js");var e=window.Forge;class t{constructor(e,t){if(this.href="",this.origin="",this.protocol="",this.host="",this.hostname="",this.port="",this.pathname="",this.search="",this.hash="",!e)return;if(!0===e.startsWith("url")){let t=e.indexOf("(")+1,i=e.lastIndexOf(")");if("undefined"===(e=e.substring(t,i).trim())||"null"===e||0===e.length)return}if(!0===e.startsWith("data:")||!0===e.startsWith("jsvtexturestore:"))return void(this.href=e);let i=e.indexOf("://");if(!(i<0||i>10)||e.startsWith("./")||e.startsWith("/")||(e="./"+e),!0===e.startsWith("/"))e=window.location.origin+e;else if(!0===e.startsWith("./")&&void 0!==window.JsView&&void 0!==window.JsView.Dom.JsSubPath){if(void 0===window.JsView.Dom.MainPath||"undefined"===window.JsView.Dom.MainPathRef||window.JsView.Dom.MainPathRef!==window.location.href){window.JsView.Dom.JsSubPath.startsWith("/")||(window.JsView.Dom.JsSubPath="/"+window.JsView.Dom.JsSubPath),window.JsView.Dom.JsSubPath.endsWith("/")||(window.JsView.Dom.JsSubPath=window.JsView.Dom.JsSubPath+"/"),window.JsView.Dom.MainPathRef=window.location.href;let e=window.location.pathname.lastIndexOf(window.JsView.Dom.JsSubPath);window.JsView.Dom.MainPath=window.location.origin+window.location.pathname.substring(0,e)}e=window.JsView.Dom.MainPath+e.substring(1)}if(this.href=e,!t)return;let o=this.href,n=o.indexOf("#");n>0&&(this.hash=o.substring(n),o=o.substring(0,n));let s=o.indexOf("?");s>1&&(this.search=o.substring(s),o=o.substring(0,s));let r=o,a=r.indexOf("://");this.protocol=a>0?r.substring(0,a+1):"";let h=a>1?r.substring(a+3):"";a=h.indexOf("/"),this.host=a>0?h.substring(0,a):"",this.pathname=a>=1?h.substring(a):"","file:"==this.protocol&&(this.host="",this.pathname=h),this.origin=this.protocol+"//"+this.host,a=this.host.indexOf(":"),this.hostname=a>0?this.host.substring(0,a):this.host,this.port=a>1?this.host.substring(a+1):""}replace(e){this.href=e}}class i{static SetBackgroundColor(t,i,o){const n=window.JsvCode.ForgeHandles.TextureManager.GetColorTextureCached(i);let s;o&&(s=new e.ViewRoundCornerMask(o.topLeft,o.topRight,o.bottomLeft,o.bottomRight));const r=new e.ExternalTextureSetting(n,s);t.ResetTexture(r)}static SetBackgroundImage(i,o,n,s,r,a,h){let w,d={};if("string"==typeof o){const e=new t(o);if(e instanceof t==!1)throw Error("Bad Argument.",e);d.url=e.href}else"linear-gradient"==o?.type&&(d.gradient=o);if(d.gradient)if(d.gradient.colors?.length>2){const e=d.gradient.colors,t=[e[0],e[e.length-1]],i=e.slice(1,e.length-1);w=window.JsvCode.ForgeHandles.TextureManager.CreateLinearGradientTexture(t,i)}else 2==d.gradient.colors?.length?w=window.JsvCode.ForgeHandles.TextureManager.CreateMiniGradientTexture(!0,d.gradient.colors[0],d.gradient.colors[1],d.gradient.rawValue):console.warn("Failed to create backgroundImage gradient, bad colors.",d.gradient.colors);else d.url&&(w=d.url.includes(".gif")||d.url.includes(".webp")?window.JsvCode.ForgeHandles.TextureManager.GetGifImage(d.url,!1,null,h):window.JsvCode.ForgeHandles.TextureManager.GetImage2(d.url,!1,r,a||e.ColorSpace.RGBA_8888));if(w){let t;n&&(t=new e.ViewRoundCornerMask(n.topLeft,n.topRight,n.bottomLeft,n.bottomRight));const o=new e.ExternalTextureSetting(w,t);if(i.ResetTexture(o),s){let e=w.RegisterLoadImageCallback(null,(function(){s({width:w.Width,height:w.Height})}));i.RegisterDetachCallback((()=>{w.UnregisterLoadImageCallback(e)}))}}}static SetMaskedBackgroundImage(i,o,n,s){if("string"==typeof o&&(o=new t(o)),o instanceof t==!1)throw Error("Bad Argument.",o);if("string"==typeof n&&(n=new t(n)),n instanceof t==!1)throw Error("Bad Argument(MaskURL).",n);const r=window.JsvCode.ForgeHandles.TextureManager.GetImage2(o.href,!1,null,s||e.ColorSpace.RGBA_8888);if(r){const t=window.JsvCode.ForgeHandles.TextureManager.GetImage2(n.href,!1,null,e.ColorSpace.RGBA_8888),o=new e.ExternalTextureSetting(r,new e.ViewTextureMask(t));i.ResetTexture(o)}}}export{e as Forge,i as ForgeExtension};
 

package/dom/target_core_revision.mjs

@@ -3,12 +3,12 @@
  */
 
 const TargetRevision = {
-  "CoreRevision": 1021746,
-  "CoreRevisionAndBranch": "1021746",
-  "JseRevision": "1.0.950",
+  "CoreRevision": 1021792,
+  "CoreRevisionAndBranch": "1021792",
+  "JseRevision": "1.0.960",
   "JseUrl":
-    "http://cdn.release.qcast.cn/forge_js/master/JsViewES6_js2c_r950.jsv.33b8f0af.js",
-  "JseName": "JsViewES6_js2c_r950.jsv.33b8f0af.js",
+    "http://cdn.release.qcast.cn/forge_js/master/JsViewES6_js2c_r960.jsv.8e87b175.js",
+  "JseName": "JsViewES6_js2c_r960.jsv.8e87b175.js",
   "JsidtName": "libjsidt.102.7.so",
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shijiu/jsview",
-  "version": "2.1.482-test.0",
+  "version": "2.2.128",
   "bin": {
     "jsview-post-build": "./tools/jsview-post-build.js",
     "jsview-post-install": "./tools/jsview-post-install.js"

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

@@ -5167,7 +5167,9 @@ function baseCreateRenderer(options, createHydrationFns) {
         // 有按键打断, 取消patch
         if (n1 == null && n2) {
             if (n2.key == "__QcodeJsviewMetroWidgetSlot" 
-            && (jsvPendingForFirstDelayRender || window.JsView?.hasPendingUserInput?.()) 
+            && (jsvPendingForFirstDelayRender 
+                || window.JsvCode.Dom.GetLazyTaskAmount() > 1200 // 1200个同步单位时间 = 60ms(每个相当于50us)
+                || window.JsView?.hasPendingUserInput?.()) 
             && JsvRenderCount >= (window.JsView?.getInstantRenderNum?.() ?? 0)) {
                 // 创建Comment节点, 以解决el释放可能出错问题
                 // 同时存储el以便给父节点进行属性链接

package/patches/node_modules/vite/dist/node/chunks/dep-ed9cb113.js

@@ -13543,6 +13543,17 @@ const buildEsbuildPlugin = (config) => {
             if (!options) {
                 return null;
             }
+
+// JsView Added >>>
+// Minify文件过滤
+            if(options.minify && tsconfckParseOptions.jsvMinifyExclude) {
+                const regex = new RegExp(tsconfckParseOptions.jsvMinifyExclude.trim() );
+                if(regex.test(chunk.name)) {
+                    options.minify = false;
+                }
+            }
+// JsView Added <<<
+
             const res = await transformWithEsbuild(code, chunk.fileName, options);
             if (config.build.lib) {
                 // #7188, esbuild adds helpers out of the UMD and IIFE wrappers, and the
@@ -13664,6 +13675,10 @@ const tsconfckParseOptions = {
     tsConfigPaths: undefined,
     root: undefined,
     resolveWithEmptyIfConfigNotFound: true,
+// JsView Added >>>
+// Minify文件过滤
+    jsvMinifyExclude: undefined, 
+// JsView Added <<<
 };
 async function initTSConfck(config) {
     const workspaceRoot = searchForWorkspaceRoot(config.root);
@@ -13675,6 +13690,10 @@ async function initTSConfck(config) {
             skip: (dir) => dir === 'node_modules' || dir === '.git',
         })),
     ]);
+// JsView Added >>>
+// Minify文件过滤
+    tsconfckParseOptions.jsvMinifyExclude = config.build.jsvMinifyExclude;
+// JsView Added <<<
     debug$f(`init tsconfck end`);
 }
 async function loadTsconfigJsonForFile(filename) {

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

@@ -18,6 +18,7 @@ const jsviewConfig = defineConfig({
     },
     emptyOutDir: true,
     minify: process.env['JSVIEW_DISABLE_MINIFY'] ? false : true,
+    jsvMinifyExclude: process.env['JSVIEW_MINIFY_EXCLUDE'],
     modulePreload: {
       polyfill: false
     },

package/tools/{jsview-build-minmap.mjs → jsview-build-minify-exclude.mjs}

@@ -1,14 +1,11 @@
 #!/usr/bin/env node
 'use strict';
 
-import fs from 'node:fs';
-import path from 'node:path';
 import {
   checkNodeVersion,
   execCommand,
   getOptions,
   parseArguments,
-  rmSync,
   Logger,
 } from './jsview-common.mjs';
 
@@ -18,20 +15,18 @@ async function main(argv)
 
   const options = getOptions();
 
-  const filter = argv.filter ?? '^jsview-';
-  const regex = new RegExp(filter);
+  const filter = argv.filter ?? 'jsview-';
+  const script = argv.script ?? 'build';
 
   var exportPrefix = 'export';
   if(process.platform == 'win32') {
       exportPrefix = 'set'
   }
-  execCommand(exportPrefix + ' JSVIEW_KEEP_CHUNKNAME=true && npm run build');
 
-  const srcmapFileNames = fs.readdirSync(options.distDebugMapDir);
-  const needlessFileNames = srcmapFileNames.filter(it => !it.match(regex));
-  for(const fileName of needlessFileNames) {
-    rmSync(options.projectDir, path.resolve(options.distDebugMapDir, fileName));
-  }
+  const cmdline = exportPrefix + ' JSVIEW_MINIFY_EXCLUDE=' + filter + ' && '
+                + exportPrefix + ' JSVIEW_KEEP_CHUNKNAME=true' + ' && '
+                + 'npm run ' + script;
+  execCommand(cmdline);
 
   Logger.Info('Done...');
 }
@@ -40,6 +35,7 @@ const requiredUsages = {
 };
 const optionalUsages = {
   '--filter': "Filter condition, it's a regex.",
+  '--script': "Build script, like: build.",
 };
 const argv = parseArguments(requiredUsages, optionalUsages);
 main(argv);

package/tools/jsview-post-build.mjs

@@ -82,9 +82,29 @@ async function prepareMainAppData(options, fileMd5)
   const appConfigFileUrl = url.pathToFileURL(appConfigFilePath);
   const { default: appConfig } = await import(appConfigFileUrl);
 
+  // 获取 chunk.jsv的map
+  const chunkHash = {};
+  const jsFileNames = fs.readdirSync(options.distJsDir);
+  for(const fileName of jsFileNames) {
+    if (!fileName.startsWith('chunk.jsv') || !fileName.endsWith('.js')) {
+      continue;
+    }
+
+    const hash = fileName.replace(/.*chunk\.jsv.([a-fA-F0-9].*).js/, '$1');
+
+    const filePath = path.resolve(options.distJsDir, fileName);
+    const sourceContent = fs.readFileSync(filePath, 'utf8');
+    const md5 = sourceContent.replace(/\n/g, '').replace(/.*\/\*jsvmd5:([a-fA-F0-9]{8})[a-fA-F0-9]*\*\/.*/, '$1');
+
+    chunkHash[hash] = md5;
+  }
+
   // 组装AppData
   appConfig.PublicKeys = [publicKeyDerText]; // 使用签名数组，支持后续追加签名
   appConfig.EncryptCodes = [encryptCodeBase64]; // 同样使用数组，支持后续追加
+  appConfig.ChunkHash = chunkHash;
+
+
 
   return JSON.stringify(appConfig);
 }
@@ -182,8 +202,8 @@ function makeMainJsvMjs(options, framework)
   };
 
   const sourceContent = fs.readFileSync(jsEntryFilePath, 'utf8');
-  const hash = sourceContent.replace(/\n/g, '').replace(/.*\/\*jsvmd5:([a-fA-F0-9]{8})[a-fA-F0-9]*\*\/.*/, '$1');
-  const newEntryFileName = `main.jsv.${hash}.js`;
+  const md5 = sourceContent.replace(/\n/g, '').replace(/.*\/\*jsvmd5:([a-fA-F0-9]{8})[a-fA-F0-9]*\*\/.*/, '$1');
+  const newEntryFileName = `main.jsv.${md5}.js`;
   const newEntryFilePath = path.resolve(path.dirname(jsEntryFilePath), newEntryFileName);
   Logger.Info(' -> ' + path.relative(options.projectDir, newEntryFilePath));
   fs.renameSync(jsEntryFilePath, newEntryFilePath);

package/tools/jsview-run-tool.mjs

@@ -25,7 +25,7 @@ async function getExtraOptions(argv)
     commandCount += (argv.configApp ? 1 : 0);
     commandCount += (argv.genKeypair ? 1 : 0);
     commandCount += (argv.runonAndroid ? 1 : 0);
-    commandCount += (argv.buildMinmap ? 1 : 0);
+    commandCount += (argv.buildMinifyExclude ? 1 : 0);
     commandCount += (argv.buildZip ? 1 : 0);
     commandCount += (argv.moduleFederation ? 1 : 0);
     commandCount += (argv.vueDevtools ? 1 : 0);
@@ -39,7 +39,7 @@ async function getExtraOptions(argv)
             'runonAndroid',
             'configApp',
             'genKeypair',
-            'buildMinmap',
+            'buildMinifyExclude',
             'buildZip',
             'vueDevtools',
             'moduleFederation',
@@ -61,7 +61,7 @@ async function getExtraOptions(argv)
         options.runonAndroid = argv.runonAndroid; 
         options.configApp = argv.configApp; 
         options.genKeypair = argv.genKeypair; 
-        options.buildMinmap = argv.buildMinmap;
+        options.buildMinifyExclude = argv.buildMinifyExclude;
         options.buildZip = argv.buildZip; 
         options.vueDevtools = argv.vueDevtools; 
         options.moduleFederation = argv.moduleFederation; 
@@ -72,7 +72,7 @@ async function getExtraOptions(argv)
     return options;
 }
 
-function doCommand(options) {
+function doCommand(options, argv) {
     let command;
     if(options.runonAndroid) {
         command = 'node node_modules/@shijiu/jsview/tools/jsview-run-android.mjs --framework=vue';
@@ -89,14 +89,20 @@ function doCommand(options) {
         command = 'node node_modules/@shijiu/jsview/tools/jsview-config-app.mjs --app-name=' + appName + ' --app-title=' + appTitle;
     } else if(options.genKeypair) {
         command = 'node node_modules/@shijiu/jsview/tools/jsview-generate-keypair.mjs';
-    } else if(options.buildMinmap) {
-        const defaultFilter = '^jsview-';
-        const filter = (typeof(options.buildMinmap) === 'string' ? options.buildMinmap : defaultFilter);
-        if(filter !== options.buildMinmap) {
-            Logger.Warn('Map filter is not set, use default value: ' + defaultFilter);
+    } else if(options.buildMinifyExclude) {
+        let filter = options.buildMinifyExclude;
+        if(typeof(filter) !== 'string') {
+            filter = 'jsview-';
+            Logger.Warn('Minify filter is not set, use default value: ' + filter);
         }
 
-        command = 'node node_modules/@shijiu/jsview/tools/jsview-build-minmap.mjs --filter=' + filter;
+        let script = argv.s ?? argv.script;
+        if(typeof(script) !== 'string') {
+            script = 'build';
+            Logger.Warn('Build script is not set, use default value: ' + script);
+        }
+
+        command = 'node node_modules/@shijiu/jsview/tools/jsview-build-minify-exclude.mjs --filter=' + filter + ' --script=' + script;
     } else if(options.buildZip) {
         const defaultPassword = 'jsview.shijiu.com';
         const password = (typeof(options.buildZip) === 'string' ? options.buildZip : defaultPassword);
@@ -129,7 +135,7 @@ async function main(argv)
 
     const options = await getExtraOptions(argv);
 
-    doCommand(options);
+    doCommand(options, argv);
 }
 
 const requiredUsages = {
@@ -139,7 +145,7 @@ const optionalUsages = {
   '-a | --runon-android': 'Run app on android devices.',
   '-c | --config-app': 'Config app, like: -c or --config-app=[AppName:AppTitle].',
   '-g | --gen-keypair': 'Generate sign keypair.',
-  '-m | --build-minmap': 'Build target with filter map, like: -m or --build-minmap=[filter].',
+  '-m | --build-minify-exclude': 'Build target with minify-exclude filter, like: -m or --build-minify-exclude=[filter], additional options: -s or --script=build:dev.',
   '-z | --build-zip': 'Build target to offline zip package, like: -z or --build-zip=[password].',
   '-d | --vue-devtools': 'Start vue dev server and vue-devtools standalone, like: -d or --vue-devtools=[port].',
   '-f | --module-federation': 'Make project to module federation, use --module-federation --help for details.',