Skip to content

Commit 6dfb548

Browse files
weareoutmanweareoutman
committed
feat(): mark unreachable builder nodes
1 parent ceaa555 commit 6dfb548

File tree

6 files changed

+77
-7
lines changed

6 files changed

+77
-7
lines changed

‎packages/brick-utils/src/builder/normalizeBuilderNode.spec.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ describe("normalizeBuilderNode", () => {
106106
id: "R-02",
107107
instanceId: "instance-r02",
108108
path: "/b",
109+
if: null,
109110
type: "routes",
110111
permissionsPreCheck: "*",
111112
},
@@ -121,6 +122,7 @@ describe("normalizeBuilderNode", () => {
121122
id: "R-02",
122123
instanceId: "instance-r02",
123124
path: "/b",
125+
if: "",
124126
type: "routes",
125127
providers: "*",
126128
},

‎packages/editor-bricks-helper/src/interfaces.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import {
33
BuilderRouteOrBrickNode,
44
CustomTemplateProxy,
55
ContextConf,
6-
BuilderRouteNode,
76
BrickLifeCycle,
87
BrickConf,
98
RouteConf,
@@ -33,6 +32,7 @@ export type BuilderRuntimeNode<P = Record<string, unknown>> =
3332
$$templateRefToUid?: Map<string, number>;
3433
$$delegatedSlots?: Map<string, TemplateDelegatedContext[]>;
3534
$$normalized?: BrickConf | RouteConf | null;
35+
$$unreachable?: boolean;
3636
};
3737

3838
export interface BuilderRuntimeEdge {

‎packages/editor-bricks-helper/src/internal/BuilderDataManager.spec.ts‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ describe("BuilderDataManager for route of bricks", () => {
134134
"$$parsedLifeCycle": Object {},
135135
"$$parsedProperties": Object {},
136136
"$$uid": 1,
137+
"$$unreachable": false,
137138
"alias": undefined,
138139
"id": "B-001",
139140
"path": "/home",
@@ -151,6 +152,7 @@ describe("BuilderDataManager for route of bricks", () => {
151152
"$$parsedLifeCycle": Object {},
152153
"$$parsedProperties": Object {},
153154
"$$uid": 2,
155+
"$$unreachable": false,
154156
"alias": "alias-a",
155157
"brick": "brick-a",
156158
"id": "B-002",
@@ -169,6 +171,7 @@ describe("BuilderDataManager for route of bricks", () => {
169171
"$$parsedLifeCycle": Object {},
170172
"$$parsedProperties": Object {},
171173
"$$uid": 3,
174+
"$$unreachable": false,
172175
"alias": "brick-b",
173176
"brick": "brick-b",
174177
"id": "B-003",
@@ -187,6 +190,7 @@ describe("BuilderDataManager for route of bricks", () => {
187190
"$$parsedLifeCycle": Object {},
188191
"$$parsedProperties": Object {},
189192
"$$uid": 4,
193+
"$$unreachable": false,
190194
"alias": "brick-c",
191195
"brick": "brick-c",
192196
"id": "B-004",
@@ -204,6 +208,7 @@ describe("BuilderDataManager for route of bricks", () => {
204208
"$$parsedLifeCycle": Object {},
205209
"$$parsedProperties": Object {},
206210
"$$uid": 5,
211+
"$$unreachable": false,
207212
"alias": "brick-d",
208213
"brick": "brick-d",
209214
"id": "B-005",
@@ -221,6 +226,7 @@ describe("BuilderDataManager for route of bricks", () => {
221226
"$$parsedLifeCycle": Object {},
222227
"$$parsedProperties": Object {},
223228
"$$uid": 6,
229+
"$$unreachable": false,
224230
"alias": "brick-e",
225231
"brick": "brick-e",
226232
"id": "B-006",
@@ -315,6 +321,7 @@ describe("BuilderDataManager for route of bricks", () => {
315321
"$$parsedLifeCycle": Object {},
316322
"$$parsedProperties": Object {},
317323
"$$uid": 7,
324+
"$$unreachable": false,
318325
"alias": "any-brick",
319326
"brick": "my.any-brick",
320327
"type": "brick",
@@ -475,6 +482,7 @@ describe("BuilderDataManager for route of bricks", () => {
475482
},
476483
},
477484
"$$uid": 7,
485+
"$$unreachable": false,
478486
"alias": "easy-view",
479487
"brick": "basic-bricks.easy-view",
480488
"properties": "{\\"containerStyle\\":{\\"gap\\":\\"var(--page-card-gap)\\"}}",
@@ -501,6 +509,7 @@ describe("BuilderDataManager for route of bricks", () => {
501509
"$$parsedLifeCycle": Object {},
502510
"$$parsedProperties": Object {},
503511
"$$uid": 8,
512+
"$$unreachable": false,
504513
"alias": "general-button",
505514
"brick": "basic-bricks.general-button",
506515
"events": "{\\"click\\":{\\"action\\":\\"console.log\\"}}",
@@ -612,6 +621,7 @@ describe("BuilderDataManager for route of bricks", () => {
612621
"$$parsedLifeCycle": Object {},
613622
"$$parsedProperties": Object {},
614623
"$$uid": 1,
624+
"$$unreachable": false,
615625
"alias": undefined,
616626
"context": Array [
617627
Object {
@@ -864,6 +874,7 @@ describe("BuilderDataManager for route of bricks", () => {
864874
"$$parsedLifeCycle": Object {},
865875
"$$parsedProperties": Object {},
866876
"$$uid": 1,
877+
"$$unreachable": false,
867878
"alias": undefined,
868879
"id": "B-001",
869880
"path": "/home",
@@ -881,6 +892,7 @@ describe("BuilderDataManager for route of bricks", () => {
881892
"$$parsedLifeCycle": Object {},
882893
"$$parsedProperties": Object {},
883894
"$$uid": 2,
895+
"$$unreachable": false,
884896
"alias": "alias-a",
885897
"brick": "brick-a",
886898
"id": "B-002",
@@ -1030,6 +1042,7 @@ describe("BuilderDataManager for route of routes", () => {
10301042
"$$parsedLifeCycle": Object {},
10311043
"$$parsedProperties": Object {},
10321044
"$$uid": 1,
1045+
"$$unreachable": false,
10331046
"alias": undefined,
10341047
"id": "B-001",
10351048
"path": "/home",
@@ -1047,6 +1060,7 @@ describe("BuilderDataManager for route of routes", () => {
10471060
"$$parsedLifeCycle": Object {},
10481061
"$$parsedProperties": Object {},
10491062
"$$uid": 2,
1063+
"$$unreachable": false,
10501064
"alias": "alias-a",
10511065
"id": "B-002",
10521066
"path": "/home/a",
@@ -1065,6 +1079,7 @@ describe("BuilderDataManager for route of routes", () => {
10651079
"$$parsedLifeCycle": Object {},
10661080
"$$parsedProperties": Object {},
10671081
"$$uid": 3,
1082+
"$$unreachable": false,
10681083
"alias": "brick-b",
10691084
"brick": "brick-b",
10701085
"id": "B-003",
@@ -1082,6 +1097,7 @@ describe("BuilderDataManager for route of routes", () => {
10821097
"$$parsedLifeCycle": Object {},
10831098
"$$parsedProperties": Object {},
10841099
"$$uid": 4,
1100+
"$$unreachable": false,
10851101
"alias": undefined,
10861102
"id": "B-004",
10871103
"path": "/home/c",
@@ -1099,6 +1115,7 @@ describe("BuilderDataManager for route of routes", () => {
10991115
"$$parsedLifeCycle": Object {},
11001116
"$$parsedProperties": Object {},
11011117
"$$uid": 5,
1118+
"$$unreachable": false,
11021119
"alias": undefined,
11031120
"id": "B-005",
11041121
"path": "/home/c/d",
@@ -1925,6 +1942,7 @@ describe("BuilderDataManager for route of routes with wrapper", () => {
19251942
"$$parsedLifeCycle": Object {},
19261943
"$$parsedProperties": Object {},
19271944
"$$uid": 1,
1945+
"$$unreachable": false,
19281946
"alias": undefined,
19291947
"id": "B-001",
19301948
"instanceId": "route-a",
@@ -1947,6 +1965,7 @@ describe("BuilderDataManager for route of routes with wrapper", () => {
19471965
"$$templateProxy": undefined,
19481966
"$$templateRefToUid": Map {},
19491967
"$$uid": 2,
1968+
"$$unreachable": false,
19501969
"alias": "tpl-page-base-page-module-1",
19511970
"brick": "tpl-page-base-page-module-1",
19521971
"id": "B-002",
@@ -1966,6 +1985,7 @@ describe("BuilderDataManager for route of routes with wrapper", () => {
19661985
"$$parsedLifeCycle": Object {},
19671986
"$$parsedProperties": Object {},
19681987
"$$uid": 3,
1988+
"$$unreachable": false,
19691989
"alias": "easy-view",
19701990
"brick": "basic-bricks.easy-view",
19711991
"id": "B-007",
@@ -1983,6 +2003,7 @@ describe("BuilderDataManager for route of routes with wrapper", () => {
19832003
"$$parsedLifeCycle": Object {},
19842004
"$$parsedProperties": Object {},
19852005
"$$uid": 4,
2006+
"$$unreachable": false,
19862007
"alias": "general-button",
19872008
"brick": "basic-bricks.general-button",
19882009
"id": "B-008",
@@ -2001,6 +2022,7 @@ describe("BuilderDataManager for route of routes with wrapper", () => {
20012022
"$$parsedLifeCycle": Object {},
20022023
"$$parsedProperties": Object {},
20032024
"$$uid": 5,
2025+
"$$unreachable": false,
20042026
"alias": "micro-view",
20052027
"brick": "basic-bricks.micro-view",
20062028
"id": "B-003",
@@ -2020,6 +2042,7 @@ describe("BuilderDataManager for route of routes with wrapper", () => {
20202042
"$$parsedLifeCycle": Object {},
20212043
"$$parsedProperties": Object {},
20222044
"$$uid": 6,
2045+
"$$unreachable": false,
20232046
"alias": "general-button",
20242047
"brick": "basic-bricks.general-button",
20252048
"id": "B-004",
@@ -2039,6 +2062,7 @@ describe("BuilderDataManager for route of routes with wrapper", () => {
20392062
"$$parsedLifeCycle": Object {},
20402063
"$$parsedProperties": Object {},
20412064
"$$uid": 7,
2065+
"$$unreachable": false,
20422066
"alias": "general-button",
20432067
"brick": "basic-bricks.general-button",
20442068
"id": "B-005",
@@ -2064,6 +2088,7 @@ describe("BuilderDataManager for route of routes with wrapper", () => {
20642088
"$$templateProxy": undefined,
20652089
"$$templateRefToUid": Map {},
20662090
"$$uid": 2,
2091+
"$$unreachable": false,
20672092
"alias": "tpl-page-base-page-module-1",
20682093
"brick": "tpl-page-base-page-module-1",
20692094
"id": "B-002",
@@ -2802,6 +2827,7 @@ describe("BuilderDataManager for route of routes with wrapper", () => {
28022827
$$parsedLifeCycle: {},
28032828
$$parsedProperties: {},
28042829
$$uid: 5,
2830+
$$unreachable: false,
28052831
alias: "micro-view",
28062832
brick: "basic-bricks.micro-view",
28072833
id: "B-003",
@@ -2868,6 +2894,7 @@ describe("BuilderDataManager for route of routes with wrapper", () => {
28682894
$$parsedLifeCycle: {},
28692895
$$parsedProperties: {},
28702896
$$uid: 5,
2897+
$$unreachable: false,
28712898
alias: "micro-view",
28722899
brick: "basic-bricks.micro-view",
28732900
id: "B-003",

‎packages/editor-bricks-helper/src/internal/getAppendingNodesAndEdges.spec.ts‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
import {
2-
BuilderCustomTemplateNode,
3-
TemplateLayoutType,
4-
} from "@next-core/brick-types";
1+
import { BuilderCustomTemplateNode } from "@next-core/brick-types";
52
import { getAppendingNodesAndEdges as _getAppendingNodesAndEdges } from "./getAppendingNodesAndEdges";
63

74
// Given two templates:
@@ -738,6 +735,7 @@ describe("getAppendingNodesAndEdges", () => {
738735
$$templateProxy: null,
739736
$$templateRefToUid: new Map(),
740737
$$uid: 1000,
738+
$$unreachable: false,
741739
alias: "tpl-test-widget",
742740
brick: "widget.tpl-test-widget",
743741
id: "B-1",
@@ -753,6 +751,7 @@ describe("getAppendingNodesAndEdges", () => {
753751
$$parsedLifeCycle: {},
754752
$$parsedProperties: {},
755753
$$uid: 1,
754+
$$unreachable: false,
756755
alias: "easy-view",
757756
brick: "easy-view",
758757
id: "T-02",
@@ -767,6 +766,7 @@ describe("getAppendingNodesAndEdges", () => {
767766
$$parsedLifeCycle: {},
768767
$$parsedProperties: {},
769768
$$uid: 2,
769+
$$unreachable: false,
770770
alias: "general-button",
771771
brick: "general-button",
772772
id: "T-03",
@@ -784,6 +784,7 @@ describe("getAppendingNodesAndEdges", () => {
784784
$$templateProxy: null,
785785
$$templateRefToUid: new Map(),
786786
$$uid: 3,
787+
$$unreachable: false,
787788
alias: "tpl-inside-widget",
788789
brick: "widget.tpl-inside-widget",
789790
id: "T-04",
@@ -798,6 +799,7 @@ describe("getAppendingNodesAndEdges", () => {
798799
$$parsedLifeCycle: {},
799800
$$parsedProperties: {},
800801
$$uid: 4,
802+
$$unreachable: false,
801803
alias: "general-select",
802804
brick: "general-select",
803805
id: "T-06",
@@ -812,6 +814,7 @@ describe("getAppendingNodesAndEdges", () => {
812814
$$parsedLifeCycle: {},
813815
$$parsedProperties: {},
814816
$$uid: 5,
817+
$$unreachable: false,
815818
alias: "general-button",
816819
brick: "general-button",
817820
id: "B-2",
@@ -828,6 +831,7 @@ describe("getAppendingNodesAndEdges", () => {
828831
$$templateProxy: null,
829832
$$templateRefToUid: new Map(),
830833
$$uid: 6,
834+
$$unreachable: false,
831835
alias: "tpl-inside-widget",
832836
brick: "widget.tpl-inside-widget",
833837
id: "B-3",
@@ -841,6 +845,7 @@ describe("getAppendingNodesAndEdges", () => {
841845
$$parsedLifeCycle: {},
842846
$$parsedProperties: {},
843847
$$uid: 7,
848+
$$unreachable: false,
844849
alias: "general-select",
845850
brick: "general-select",
846851
id: "T-06",
@@ -1179,6 +1184,7 @@ describe("getAppendingNodesAndEdges", () => {
11791184
"$$parsedLifeCycle": Object {},
11801185
"$$parsedProperties": Object {},
11811186
"$$uid": 1000,
1187+
"$$unreachable": false,
11821188
"alias": undefined,
11831189
"id": "B-001",
11841190
"path": "/page-1",
@@ -1215,6 +1221,7 @@ describe("getAppendingNodesAndEdges", () => {
12151221
"pageTitle" => 3,
12161222
},
12171223
"$$uid": 1,
1224+
"$$unreachable": false,
12181225
"alias": "tpl-page-wrapper-theme",
12191226
"brick": "tpl-page-wrapper-theme",
12201227
"id": "B-002",
@@ -1242,6 +1249,7 @@ describe("getAppendingNodesAndEdges", () => {
12421249
"$$parsedLifeCycle": Object {},
12431250
"$$parsedProperties": Object {},
12441251
"$$uid": 2,
1252+
"$$unreachable": false,
12451253
"alias": "easyView",
12461254
"brick": "basic-bricks.easy-view",
12471255
"id": "TT-1",
@@ -1269,6 +1277,7 @@ describe("getAppendingNodesAndEdges", () => {
12691277
"$$templateProxy": undefined,
12701278
"$$templateRefToUid": Map {},
12711279
"$$uid": 3,
1280+
"$$unreachable": false,
12721281
"alias": "pageTitle",
12731282
"brick": "tpl-page-wrapper-theme-1",
12741283
"id": "TT-2",
@@ -1289,6 +1298,7 @@ describe("getAppendingNodesAndEdges", () => {
12891298
"$$parsedLifeCycle": Object {},
12901299
"$$parsedProperties": Object {},
12911300
"$$uid": 4,
1301+
"$$unreachable": false,
12921302
"alias": "general-button",
12931303
"brick": "basic-bricks.general-button",
12941304
"id": "TT-3",
@@ -1326,6 +1336,7 @@ describe("getAppendingNodesAndEdges", () => {
13261336
"pageTitle" => 3,
13271337
},
13281338
"$$uid": 1,
1339+
"$$unreachable": false,
13291340
"alias": "tpl-page-wrapper-theme",
13301341
"brick": "tpl-page-wrapper-theme",
13311342
"id": "B-002",

0 commit comments

Comments
 (0)