@shijiu/jsview 3.0.0-next-vue.0 → 3.0.0-test.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shijiu/jsview",
-  "version": "3.0.0-next-vue.0",
+  "version": "3.0.0-test.0",
   "type": "module",
   "bin": {
     "jsview-post-build": "./tools/jsview-post-build.mjs",

package/patches/@vue+runtime-core+3.6.0-beta.10.patch

@@ -1,5 +1,5 @@
 diff --git a/node_modules/@vue/runtime-core/dist/runtime-core.esm-bundler.js b/node_modules/@vue/runtime-core/dist/runtime-core.esm-bundler.js
-index 42090ab..fe02eba 100644
+index 42090ab..c1c9825 100644
 --- a/node_modules/@vue/runtime-core/dist/runtime-core.esm-bundler.js
 +++ b/node_modules/@vue/runtime-core/dist/runtime-core.esm-bundler.js
 @@ -5,6 +5,11 @@
@@ -8,27 +8,26 @@ index 42090ab..fe02eba 100644
  import { EMPTY_ARR, EMPTY_OBJ, NO, NOOP, camelize, camelize as camelize$1, capitalize, capitalize as capitalize$1, def, extend, getEscapedCssVarName, getGlobalThis, getModifierPropName, getSequence, hasChanged, hasOwn, hyphenate, includeBooleanAttr, invokeArrayFns, isArray, isBooleanAttr, isBuiltInDirective, isBuiltInTag, isFunction, isGloballyAllowed, isKnownHtmlAttr, isKnownSvgAttr, isModelListener, isObject, isOn, isPromise, isRegExp, isRenderableAttrValue, isReservedProp, isString, isSymbol, looseEqual, looseToNumber, makeMap, normalizeClass, normalizeClass as normalizeClass$1, normalizeCssVarValue, normalizeProps, normalizeStyle, normalizeStyle as normalizeStyle$1, remove, stringifyStyle, toDisplayString, toHandlerKey, toHandlerKey as toHandlerKey$1, toNumber, toRawType } from "@vue/shared";
 +
 +// JsView Added >>>
-+import { jsvSliceDelayQueue, jsvPostDelayQueue, jsvRemoveNodeIfRenderBreaked, jsvCancelPatchIfRenderBreaked, jsvUpdatePatchNode, jsvResetPatchNode } from "@shijiu/jsview/thirdparty/@vue/runtime-core/jsview-render-break.mjs";
++import { jsvFlushDelayJobs, jsvPostDelayQueue, jsvRemoveNodeIfRenderBreaked, jsvCancelPatchIfRenderBreaked, jsvUpdatePatchNode, jsvResetPatchNode } from "@shijiu/jsview/thirdparty/@vue/runtime-core/jsview-render-break.mjs";
 +// JsView Added <<<
 +
  //#region packages/runtime-core/src/warning.ts
  const stack = [];
  /**
-@@ -366,6 +371,13 @@ function flushOnAppMount(instance) {
+@@ -366,6 +371,12 @@ function flushOnAppMount(instance) {
  }
  function flushJobs(seen) {
  	if (!!(process.env.NODE_ENV !== "production")) seen || (seen = /* @__PURE__ */ new Map());
 +
 +// JsView Added >>>
 +// 将延迟后的任务放入执行队列前，如果任务本身已经失效了，此instance.update就会被设置成inactive
-+	const jsvDelayQueueSize = jsvSliceDelayQueue(jobs);
-+	jobsLength += jsvDelayQueueSize;
++	jsvFlushDelayJobs(seen, checkRecursiveUpdates, handleError);
 +// JsView Added <<<
 +
  	try {
  		while (flushIndex < jobsLength) {
  			const job = jobs[flushIndex];
-@@ -393,6 +405,10 @@ function flushJobs(seen) {
+@@ -393,6 +404,10 @@ function flushJobs(seen) {
  		currentFlushPromise = null;
  		if (jobsLength || postJobs.length) flushJobs(seen);
  	}
@@ -39,7 +38,7 @@ index 42090ab..fe02eba 100644
  }
  function checkRecursiveUpdates(seen, fn) {
  	const count = seen.get(fn) || 0;
-@@ -2440,6 +2456,11 @@ function resolveAsset(type, name, warnMissing = true, maybeSelfReference = false
+@@ -2440,6 +2455,11 @@ function resolveAsset(type, name, warnMissing = true, maybeSelfReference = false
  		if (!res && maybeSelfReference) return Component;
  		if (!!(process.env.NODE_ENV !== "production") && warnMissing && !res) {
  			const extra = type === "components" ? "\nIf this is a native custom element, make sure to exclude it from component resolution via compilerOptions.isCustomElement." : ``;
@@ -51,7 +50,7 @@ index 42090ab..fe02eba 100644
  			warn$1(`Failed to resolve ${type.slice(0, -1)}: ${name}${extra}`);
  		}
  		return res;
-@@ -3637,7 +3658,12 @@ const isElementRoot = (vnode) => {
+@@ -3637,7 +3657,12 @@ const isElementRoot = (vnode) => {
  };
  function shouldUpdateComponent(prevVNode, nextVNode, optimized) {
  	const { props: prevProps, children: prevChildren, component } = prevVNode;
@@ -65,7 +64,7 @@ index 42090ab..fe02eba 100644
  	const emits = component.emitsOptions;
  	if (!!(process.env.NODE_ENV !== "production") && (prevChildren || nextChildren) && isHmrUpdating) return true;
  	if (nextVNode.dirs || nextVNode.transition) return true;
-@@ -4173,6 +4199,17 @@ function baseCreateRenderer(options, createHydrationFns) {
+@@ -4173,6 +4198,17 @@ function baseCreateRenderer(options, createHydrationFns) {
  	if (!!(process.env.NODE_ENV !== "production") || __VUE_PROD_DEVTOOLS__) setDevtoolsHook$1(target.__VUE_DEVTOOLS_GLOBAL_HOOK__, target);
  	const { insert: hostInsert, remove: hostRemove, patchProp: hostPatchProp, createElement: hostCreateElement, createText: hostCreateText, createComment: hostCreateComment, setText: hostSetText, setElementText: hostSetElementText, parentNode: hostParentNode, nextSibling: hostNextSibling, setScopeId: hostSetScopeId = NOOP, insertStaticContent: hostInsertStaticContent } = options;
  	const patch = (n1, n2, container, anchor = null, parentComponent = null, parentSuspense = null, namespace = void 0, slotScopeIds = null, optimized = !!(process.env.NODE_ENV !== "production") && isHmrUpdating ? false : !!n2.dynamicChildren) => {
@@ -83,7 +82,7 @@ index 42090ab..fe02eba 100644
  		if (n1 === n2) return;
  		if (n1 && !isSameVNodeType(n1, n2)) {
  			anchor = getNextHostNode(n1);
-@@ -4183,6 +4220,16 @@ function baseCreateRenderer(options, createHydrationFns) {
+@@ -4183,6 +4219,16 @@ function baseCreateRenderer(options, createHydrationFns) {
  			optimized = false;
  			n2.dynamicChildren = null;
  		}
@@ -100,7 +99,7 @@ index 42090ab..fe02eba 100644
  		const { type, ref, shapeFlag } = n2;
  		switch (type) {
  			case Text:
-@@ -4209,6 +4256,11 @@ function baseCreateRenderer(options, createHydrationFns) {
+@@ -4209,6 +4255,11 @@ function baseCreateRenderer(options, createHydrationFns) {
  		}
  		if (ref != null && parentComponent) setRef(ref, n1 && n1.ref, parentSuspense, n2 || n1, !n2);
  		else if (ref == null && n1 && n1.ref != null) setRef(n1.ref, null, parentSuspense, n1, true);
@@ -112,7 +111,7 @@ index 42090ab..fe02eba 100644
  	};
  	const processText = (n1, n2, container, anchor) => {
  		if (n1 == null) hostInsert(n2.el = hostCreateText(n2.children), container, anchor);
-@@ -4536,6 +4588,11 @@ function baseCreateRenderer(options, createHydrationFns) {
+@@ -4536,6 +4587,11 @@ function baseCreateRenderer(options, createHydrationFns) {
  		fn() {
  			const { instance, initialVNode, container, anchor, parentSuspense, namespace, optimized } = this;
  			if (!instance.isMounted) {
@@ -124,7 +123,7 @@ index 42090ab..fe02eba 100644
  				let vnodeHook;
  				const { el, props } = initialVNode;
  				const { bm, parent, root, type } = instance;
-@@ -4574,7 +4631,17 @@ function baseCreateRenderer(options, createHydrationFns) {
+@@ -4574,7 +4630,17 @@ function baseCreateRenderer(options, createHydrationFns) {
  				instance.isMounted = true;
  				if (!!(process.env.NODE_ENV !== "production") || __VUE_PROD_DEVTOOLS__) devtoolsComponentAdded(instance);
  				this.initialVNode = this.container = this.anchor = null;
@@ -142,7 +141,7 @@ index 42090ab..fe02eba 100644
  				let { next, bu, u, parent, vnode } = instance;
  				{
  					const nonHydratedAsyncRoot = locateNonHydratedAsyncRoot(instance);
-@@ -4608,7 +4675,14 @@ function baseCreateRenderer(options, createHydrationFns) {
+@@ -4608,7 +4674,14 @@ function baseCreateRenderer(options, createHydrationFns) {
  				const prevTree = instance.subTree;
  				instance.subTree = nextTree;
  				if (!!(process.env.NODE_ENV !== "production")) startMeasure(instance, `patch`);
@@ -158,7 +157,7 @@ index 42090ab..fe02eba 100644
  				if (!!(process.env.NODE_ENV !== "production")) endMeasure(instance, `patch`);
  				next.el = nextTree.el;
  				if (originNext === null) updateHOCHostEl(instance, nextTree.el);
-@@ -4616,6 +4690,11 @@ function baseCreateRenderer(options, createHydrationFns) {
+@@ -4616,6 +4689,11 @@ function baseCreateRenderer(options, createHydrationFns) {
  				if (vnodeHook = next.props && next.props.onVnodeUpdated) queuePostRenderEffect(() => invokeVNodeHook(vnodeHook, parent, next, vnode), void 0, parentSuspense);
  				if (!!(process.env.NODE_ENV !== "production") || __VUE_PROD_DEVTOOLS__) devtoolsComponentUpdated(instance);
  				if (!!(process.env.NODE_ENV !== "production")) popWarningContext();
@@ -170,19 +169,22 @@ index 42090ab..fe02eba 100644
  			}
  		}
  	}
-@@ -4820,6 +4899,11 @@ function baseCreateRenderer(options, createHydrationFns) {
+@@ -4820,6 +4898,14 @@ function baseCreateRenderer(options, createHydrationFns) {
  			else parentComponent.ctx.deactivate(vnode);
  			return;
  		}
 +
 +// JsView Added >>>
-+		jsvResetPatchNode(vnode);
++		const breaked = jsvResetPatchNode(vnode);
++		if (breaked) {
++			return;
++		}
 +// JsView Added <<<
 +
  		const shouldInvokeDirs = shapeFlag & 1 && dirs;
  		const shouldInvokeVnodeHook = !isAsyncWrapper(vnode);
  		let vnodeHook;
-@@ -5505,6 +5589,11 @@ function createBaseVNode(type, props = null, children = null, patchFlag = 0, dyn
+@@ -5505,6 +5591,11 @@ function createBaseVNode(type, props = null, children = null, patchFlag = 0, dyn
  		patchFlag,
  		dynamicProps,
  		dynamicChildren: null,

package/thirdparty/@vue/runtime-core/jsview-render-break.mjs

@@ -3,31 +3,41 @@
  */
 'use strict';
 
-const jsvDelayQueue = [];
+const jsvDelayQueueRecord = [];
+let jsvDelayQueue = [];
 let jsvPendingForFirstDelayRender = false;
 let jsvDelayQueueTimer = 0;
 let jsvDelayQueueTaskToken = 1;
-const jsvDelayQueueRecord = [];
 let JsvRenderCount = 0;
 
-function jsvSliceDelayQueue(queue)
+function jsvFlushDelayJobs(seen, checkRecursiveUpdates, handleError)
 {
-	let delayQueueSize = jsvDelayQueue?.length ?? 0;
-
 	if (jsvDelayQueue.length > 0 && !jsvPendingForFirstDelayRender) {
 		// 将延迟后的任务放入执行队列前，如果任务本身已经失效了，此instance.update就会被设置成inactive
 		// console.log("QCodeDrop jsvDelayQueue.length=", jsvDelayQueue.length);
-		queue.unshift(...jsvDelayQueue);
+		const jobs = jsvDelayQueue;
 
 		// 记录 Recorder 用于调试
 		// jsvDelayQueueRecord.length = 0;
 		// jsvDelayQueueRecord.unshift(...jsvDelayQueue);
 
-		jsvDelayQueue.length = 0;
+		jsvDelayQueue = [];
 		jsvDelayQueueTaskToken++;
-	}
 
-	return delayQueueSize;
+		for (const job of jobs) {
+			if (!(job.flags & 4)) {
+				if (!!(process.env.NODE_ENV !== "production") && checkRecursiveUpdates(seen, job)) continue;
+				if (job.flags & 2) job.flags &= -2;
+				try {
+					job();
+				} catch (err) {
+					handleError(err, job.i, job.i ? 15 : 14);
+				} finally {
+					if (!(job.flags & 2)) job.flags &= -2;
+				}
+			}
+		}
+	}
 }
 
 function jsvPostDelayQueue(queueFlush)
@@ -167,20 +177,22 @@ function jsvResetPatchNode(vnode)
 		// 但是 mount 状态需要进行记录，避免由于RenderBreaker引起子节点未patch因为无法umount状态
 
 		if (vnode.jsvRenderBreaker?.breaked) {
-			vnode.el.parentNode.removeChild(vnode.el);
+			vnode.el?.parentNode.removeChild(vnode.el);
 			vnode.el = null;
 			vnode.anchor = null;
 			vnode.jsvRenderBreaker = null;
 		}
-		return;
+		return true;
 	} else {
 		// unmount时重置jsvPatchedFlag
 		vnode.jsvPatchedFlag = false;
 	}
+
+	return false;
 }
 
 export {
-	jsvSliceDelayQueue,
+	jsvFlushDelayJobs,
 	jsvPostDelayQueue,
 	jsvRemoveNodeIfRenderBreaked,
 	jsvCancelPatchIfRenderBreaked,

package/tools/jsview-post-install.mjs

@@ -50,9 +50,9 @@ function checkNpmMissingDepPkgs(options, linkablePkgNames)
 
     for (const dep in linkablePkgObj.dependencies ?? {}) {
       const depPath = path.resolve(options.modulesDir, dep);
-      if (fs.existsSync(depPath)) {
-        continue;
-      }
+      // if (fs.existsSync(depPath)) {
+      //   continue;
+      // }
 
       const depPkg = dep + "@" + linkablePkgObj.dependencies[dep];
       missingDepPkgs += ' ' + depPkg;
@@ -231,7 +231,7 @@ async function printRevision(options)
   Logger.Info('**************************************************');
 }
 
-function doPostInstall(framework, pkgNeedPatch, skipCheckVersion, skipCheckNpmcmd)
+function doPostInstall(framework, pkgNeedPatches, skipCheckVersion, skipCheckNpmcmd)
 {
   const options = getOptions(framework);
   options.projectDir = process.cwd();
@@ -259,9 +259,7 @@ function doPostInstall(framework, pkgNeedPatch, skipCheckVersion, skipCheckNpmcm
   checkNpmLinkForDebug(options, linkablePkgNames);
 
   Logger.Tip('Stage 2: Auto patching packages...');
-  autoPatchPackages(options, pkgNeedPatch.patchModules);
-
-  // installPatches(options, pkgNeedPatch.installModules, skipCheckVersion);
+  autoPatchPackages(options, pkgNeedPatches);
 
   printRevision(options);
 }
@@ -270,35 +268,23 @@ function main(argv)
 {
   checkNodeVersion();
 
-  let pkgNeedPatch;
+  let pkgNeedPatches;
 
   switch (argv.framework) {
     case 'vue':
-      pkgNeedPatch = {
-        installModules: [
-          // '@vitejs/plugin-vue',
-          // '@vue/compiler-dom',
-          // '@vue/compiler-sfc',
-          // '@vue/runtime-core',
-          // '@vue/runtime-dom',
-          // 'postcss-js',
-          'vite',
-          // 'vue-router',
-        ],
-        patchModules: [
-          '@vitejs+plugin-vue+6.0.6.patch',
-          '@vue+compiler-dom+3.6.0-beta.10.patch',
-          '@vue+compiler-sfc+3.6.0-beta.10.patch',
-          '@vue+runtime-core+3.6.0-beta.10.patch',
-          '@vue+runtime-dom+3.6.0-beta.10.patch',
-          'postcss-js+5.1.0.patch',
-          'vite+8.0.9.patch',
-          'vue-router+5.0.6.patch',
-        ]
-      };
+      pkgNeedPatches = [
+        '@vitejs+plugin-vue+6.0.6.patch',
+        '@vue+compiler-dom+3.6.0-beta.10.patch',
+        '@vue+compiler-sfc+3.6.0-beta.10.patch',
+        '@vue+runtime-core+3.6.0-beta.10.patch',
+        '@vue+runtime-dom+3.6.0-beta.10.patch',
+        'postcss-js+5.1.0.patch',
+        'vite+8.0.9.patch',
+        'vue-router+5.0.6.patch',
+      ]
       break;
     // case 'react':
-    //   pkgNeedPatch = [
+    //   pkgNeedPatches = [
     //     'react-dev-utils',
     //     'react-dom',
     //     'react-scripts',
@@ -313,7 +299,7 @@ function main(argv)
     argv.skipCheckVersion = true;
   }
 
-  doPostInstall(argv.framework, pkgNeedPatch, argv.skipCheckVersion, argv.skipCheckNpmcmd);
+  doPostInstall(argv.framework, pkgNeedPatches, argv.skipCheckVersion, argv.skipCheckNpmcmd);
 }
 
 const requiredUsages = {