@antv/layout 2.0.0-beta.1 → 2.0.0

package/lib/algorithm/antv-dagre/rank/index.js

@@ -1,6 +1,6 @@
 import { feasibleTreeWithLayer } from './feasible-tree.js';
 import { networkSimplex } from './network-simplex.js';
-import { longestPath, longestPathWithLayer } from './util.js';
+import { longestPathWithLayer, longestPath } from './util.js';
 
 /*
  * Assigns a rank to each node in the input graph that respects the "minlen"

package/lib/algorithm/concentric/index.js

@@ -1,7 +1,7 @@
 import { __awaiter } from '../../node_modules/tslib/tslib.es6.js';
 import { applySingleNodeLayout } from '../../util/common.js';
 import '../../node_modules/@antv/expr/dist/index.esm.js';
-import { formatFn, formatNodeSizeFn } from '../../util/format.js';
+import { formatNodeSizeFn, formatFn } from '../../util/format.js';
 import { orderByDegree, orderBySorter } from '../../util/order.js';
 import { normalizeViewport } from '../../util/viewport.js';
 import { BaseLayout } from '../base-layout.js';

package/lib/index.d.ts

@@ -40,11 +40,11 @@ export { AntVDagreLayoutOptions } from './algorithm/antv-dagre/types.js';
 export { CircularLayoutOptions } from './algorithm/circular/types.js';
 export { ComboCombinedLayoutOptions } from './algorithm/combo-combined/types.js';
 export { ConcentricLayoutOptions } from './algorithm/concentric/types.js';
-export { D3ForceLayoutOptions } from './algorithm/d3-force/types.js';
 export { D3Force3DLayoutOptions } from './algorithm/d3-force-3d/types.js';
+export { D3ForceLayoutOptions } from './algorithm/d3-force/types.js';
 export { DagreLayoutOptions } from './algorithm/dagre/types.js';
-export { ForceLayoutOptions } from './algorithm/force/types.js';
 export { ForceAtlas2LayoutOptions } from './algorithm/force-atlas2/types.js';
+export { ForceLayoutOptions } from './algorithm/force/types.js';
 export { FruchtermanLayoutOptions } from './algorithm/fruchterman/types.js';
 export { GridLayoutOptions } from './algorithm/grid/types.js';
 export { MDSLayoutOptions } from './algorithm/mds/types.js';

package/lib/runtime/supervisor.js

@@ -49,23 +49,37 @@ class Supervisor {
      * Resolve worker script path which works in both ESM and UMD environments
      */
     resolveWorkerPath() {
-        if (typeof import.meta !== 'undefined' && import.meta.url) {
-            const currentUrl = new URL(import.meta.url);
-            // e.g. `.../lib/runtime/supervisor.js` -> `.../lib/worker.js`
-            const asRoot = currentUrl.href.replace(/\/runtime\/[^/]+\.js$/, '/worker.js');
-            if (asRoot !== currentUrl.href)
-                return asRoot;
-            // Fallback: keep legacy behavior (same directory)
-            return currentUrl.href.replace(/\/[^/]+\.js$/, '/worker.js');
-        }
-        if (typeof document !== 'undefined') {
+        const scriptUrl = (() => {
+            if (typeof document === 'undefined')
+                return null;
+            const currentScript = document.currentScript;
+            if (currentScript === null || currentScript === void 0 ? void 0 : currentScript.src)
+                return currentScript.src;
             const scripts = document.getElementsByTagName('script');
             for (let i = scripts.length - 1; i >= 0; i--) {
                 const src = scripts[i].src;
-                if (src && (src.includes('index.js') || src.includes('index.min.js'))) {
-                    return src.replace(/index(\.min)?\.js/, 'worker.js');
+                if (!src)
+                    continue;
+                if (src.includes('index.js') || src.includes('index.min.js')) {
+                    return src;
                 }
             }
+            return null;
+        })();
+        if (scriptUrl) {
+            if (scriptUrl.includes('index.js') || scriptUrl.includes('index.min.js')) {
+                const asIndex = scriptUrl.replace(/index(\.min)?\.(m?js)(\?.*)?$/, 'worker.js');
+                if (asIndex !== scriptUrl)
+                    return asIndex;
+            }
+            // e.g. `.../lib/runtime/supervisor.js` -> `.../lib/worker.js`
+            const asRoot = scriptUrl.replace(/\/runtime\/[^/]+\.(m?js)(\?.*)?$/, '/worker.js');
+            if (asRoot !== scriptUrl)
+                return asRoot;
+            // Fallback: keep legacy behavior (same directory)
+            const asSibling = scriptUrl.replace(/\/[^/]+\.(m?js)(\?.*)?$/, '/worker.js');
+            if (asSibling !== scriptUrl)
+                return asSibling;
         }
         return './worker.js';
     }

package/lib/runtime/supervisor.js.map

@@ -1 +1 @@
-{"version":3,"file":"supervisor.js","sources":["../../src/runtime/src/runtime/supervisor.ts"],"sourcesContent":[null],"names":[],"mappings":";;;MAIa,UAAU,CAAA;AAAvB,IAAA,WAAA,GAAA;QACU,IAAA,CAAA,MAAM,GAAkB,IAAI;QAC5B,IAAA,CAAA,SAAS,GAAgC,IAAI;IAyEvD;AAvEE;;AAEG;AACG,IAAA,OAAO,CACX,QAAgB,EAChB,IAAe,EACf,OAAoB,EAAA;;AAEpB,YAAA,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;AAChB,gBAAA,MAAM,IAAI,CAAC,UAAU,EAAE;AACxB,YAAA;AAED,YAAA,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;AACnB,gBAAA,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC;AAC9C,YAAA;AAED,YAAA,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC;QAC9D,CAAC,CAAA;AAAA,IAAA;AAED;;AAEG;IACH,OAAO,GAAA;QACL,IAAI,IAAI,CAAC,SAAS,EAAE;AAClB,YAAA,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;AACzB,QAAA;QACD,IAAI,IAAI,CAAC,MAAM,EAAE;AACf,YAAA,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;AACvB,YAAA,IAAI,CAAC,MAAM,GAAG,IAAI;AAClB,YAAA,IAAI,CAAC,SAAS,GAAG,IAAI;AACtB,QAAA;IACH;AAEA;;AAEG;IACW,UAAU,GAAA;;AACtB,YAAA,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,EAAE;AAE3C,YAAA,MAAM,KAAK,GAAG,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC;YACzE,MAAM,IAAI,GAAG,KAAK,GAAG,QAAQ,GAAG,SAAS;AAEzC,YAAA,IAAI,CAAC,MAAM,GAAG,IAAI,MAAM,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,CAAC;YAC9C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAe,IAAI,CAAC,MAAM,CAAC;QAClD,CAAC,CAAA;AAAA,IAAA;AAED;;AAEG;IACK,iBAAiB,GAAA;AACvB,QAAA,IAAI,OAAO,MAAM,CAAC,IAAI,KAAK,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;YACzD,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;;AAE3C,YAAA,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,uBAAuB,EAAE,YAAY,CAAC;AAC7E,YAAA,IAAI,MAAM,KAAK,UAAU,CAAC,IAAI;AAAE,gBAAA,OAAO,MAAM;;YAE7C,OAAO,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,YAAY,CAAC;AAC7D,QAAA;AAED,QAAA,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE;YACnC,MAAM,OAAO,GAAG,QAAQ,CAAC,oBAAoB,CAAC,QAAQ,CAAC;AACvD,YAAA,KAAK,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;gBAC5C,MAAM,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG;AAC1B,gBAAA,IAAI,GAAG,KAAK,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,EAAE;oBACrE,OAAO,GAAG,CAAC,OAAO,CAAC,mBAAmB,EAAE,WAAW,CAAC;AACrD,gBAAA;AACF,YAAA;AACF,QAAA;AAED,QAAA,OAAO,aAAa;IACtB;AACD;;;;"}
+{"version":3,"file":"supervisor.js","sources":["../../src/runtime/src/runtime/supervisor.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}

package/lib/util/format.js

@@ -1,5 +1,5 @@
 import { evaluateExpression } from './expr.js';
-import { isSize, parseSize } from './size.js';
+import { parseSize, isSize } from './size.js';
 import isNil from '../node_modules/@antv/util/esm/lodash/is-nil.js';
 import isString from '../node_modules/@antv/util/esm/lodash/is-string.js';
 import isNumber from '../node_modules/@antv/util/esm/lodash/is-number.js';

package/lib/worker.js

@@ -1452,23 +1452,37 @@ class Supervisor {
      * Resolve worker script path which works in both ESM and UMD environments
      */
     resolveWorkerPath() {
-        if (typeof import.meta !== 'undefined' && import.meta.url) {
-            const currentUrl = new URL(import.meta.url);
-            // e.g. `.../lib/runtime/supervisor.js` -> `.../lib/worker.js`
-            const asRoot = currentUrl.href.replace(/\/runtime\/[^/]+\.js$/, '/worker.js');
-            if (asRoot !== currentUrl.href)
-                return asRoot;
-            // Fallback: keep legacy behavior (same directory)
-            return currentUrl.href.replace(/\/[^/]+\.js$/, '/worker.js');
-        }
-        if (typeof document !== 'undefined') {
+        const scriptUrl = (() => {
+            if (typeof document === 'undefined')
+                return null;
+            const currentScript = document.currentScript;
+            if (currentScript === null || currentScript === void 0 ? void 0 : currentScript.src)
+                return currentScript.src;
             const scripts = document.getElementsByTagName('script');
             for (let i = scripts.length - 1; i >= 0; i--) {
                 const src = scripts[i].src;
-                if (src && (src.includes('index.js') || src.includes('index.min.js'))) {
-                    return src.replace(/index(\.min)?\.js/, 'worker.js');
+                if (!src)
+                    continue;
+                if (src.includes('index.js') || src.includes('index.min.js')) {
+                    return src;
                 }
             }
+            return null;
+        })();
+        if (scriptUrl) {
+            if (scriptUrl.includes('index.js') || scriptUrl.includes('index.min.js')) {
+                const asIndex = scriptUrl.replace(/index(\.min)?\.(m?js)(\?.*)?$/, 'worker.js');
+                if (asIndex !== scriptUrl)
+                    return asIndex;
+            }
+            // e.g. `.../lib/runtime/supervisor.js` -> `.../lib/worker.js`
+            const asRoot = scriptUrl.replace(/\/runtime\/[^/]+\.(m?js)(\?.*)?$/, '/worker.js');
+            if (asRoot !== scriptUrl)
+                return asRoot;
+            // Fallback: keep legacy behavior (same directory)
+            const asSibling = scriptUrl.replace(/\/[^/]+\.(m?js)(\?.*)?$/, '/worker.js');
+            if (asSibling !== scriptUrl)
+                return asSibling;
         }
         return './worker.js';
     }