@bleedingdev/modern-js-create 3.5.0-ultramodern.77 → 3.5.0-ultramodern.79

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -63,19 +63,44 @@ function splitPeerContext(locator) {
63
63
  base: locator,
64
64
  peers: []
65
65
  };
66
+ const context = locator.slice(peerStart);
67
+ const segments = [];
68
+ let start = -1;
69
+ let depth = 0;
70
+ for(let index = 0; index < context.length; index += 1){
71
+ const character = context[index];
72
+ if ('(' === character) {
73
+ if (0 === depth) start = index + 1;
74
+ depth += 1;
75
+ continue;
76
+ }
77
+ if (')' !== character || 0 === depth) {
78
+ if (0 === depth) return {
79
+ unresolved: locator
80
+ };
81
+ continue;
82
+ }
83
+ depth -= 1;
84
+ if (0 === depth) {
85
+ const segment = context.slice(start, index);
86
+ if ('' === segment) return {
87
+ unresolved: locator
88
+ };
89
+ segments.push(segment);
90
+ start = -1;
91
+ }
92
+ }
93
+ if (0 !== depth || -1 !== start) return {
94
+ unresolved: locator
95
+ };
66
96
  const peers = [];
67
- let suffix = locator.slice(peerStart);
68
- while('' !== suffix){
69
- const match = /^\(([^()]+)\)/u.exec(suffix);
70
- if (!match) return {
71
- unresolved: locator
72
- };
73
- const peer = parsePackageLocator(match[1]);
97
+ for (const segment of segments){
98
+ if (/^patch_hash=[a-f0-9]{32,128}$/u.test(segment) || /^[a-f0-9]{32,128}$/u.test(segment)) continue;
99
+ const peer = parsePackageKey(segment);
74
100
  if (!peer) return {
75
101
  unresolved: locator
76
102
  };
77
103
  peers.push(peer);
78
- suffix = suffix.slice(match[0].length);
79
104
  }
80
105
  return {
81
106
  base: locator.slice(0, peerStart),
@@ -181,23 +206,17 @@ function discoverReachablePnpmLockReleaseAgeClosure(lockfile) {
181
206
  }
182
207
  const nodes = new Map();
183
208
  const nodeIdsByIdentity = new Map();
184
- const allNodeIds = new Set([
185
- ...packageRecords.keys(),
186
- ...snapshotRecords.keys()
187
- ]);
188
209
  for (const nodeId of [
189
- ...allNodeIds
210
+ ...snapshotRecords.keys()
190
211
  ].sort((left, right)=>left.localeCompare(right))){
191
212
  const identity = parsePackageKey(nodeId);
192
213
  if (!identity) continue;
214
+ const key = packageVersionKey(identity);
193
215
  nodes.set(nodeId, {
194
216
  identity,
195
- records: [
196
- packageRecords.get(nodeId),
197
- snapshotRecords.get(nodeId)
198
- ].filter((record)=>void 0 !== record)
217
+ packageRecords: (packageRecordsByIdentity.get(key) ?? []).map(([, record])=>record),
218
+ snapshotRecord: snapshotRecords.get(nodeId)
199
219
  });
200
- const key = packageVersionKey(identity);
201
220
  nodeIdsByIdentity.set(key, [
202
221
  ...nodeIdsByIdentity.get(key) ?? [],
203
222
  nodeId
@@ -251,16 +270,15 @@ function discoverReachablePnpmLockReleaseAgeClosure(lockfile) {
251
270
  const nodeId = queue.shift();
252
271
  const node = nodes.get(nodeId);
253
272
  const nodePath = shortestNodePaths.get(nodeId);
254
- if (!snapshotRecords.has(nodeId)) {
255
- recordUnresolved(node.identity, nodePath, 'missing lock snapshot');
256
- continue;
257
- }
258
- if (!packageRecords.has(nodeId)) {
273
+ if (0 === node.packageRecords.length) {
259
274
  recordUnresolved(node.identity, nodePath, 'missing lock package');
260
275
  continue;
261
276
  }
262
277
  for (const peer of node.identity.peers)enqueueIdentity(peer, nodePath);
263
- for (const record of node.records)for (const edge of dependencyEdges(record)){
278
+ for (const record of [
279
+ ...node.packageRecords,
280
+ node.snapshotRecord
281
+ ])for (const edge of dependencyEdges(record)){
264
282
  const identity = dependencyIdentity(edge.dependencyName, edge.descriptor);
265
283
  if (identity) {
266
284
  if ('unresolved' in identity) {
@@ -28,19 +28,44 @@ function splitPeerContext(locator) {
28
28
  base: locator,
29
29
  peers: []
30
30
  };
31
+ const context = locator.slice(peerStart);
32
+ const segments = [];
33
+ let start = -1;
34
+ let depth = 0;
35
+ for(let index = 0; index < context.length; index += 1){
36
+ const character = context[index];
37
+ if ('(' === character) {
38
+ if (0 === depth) start = index + 1;
39
+ depth += 1;
40
+ continue;
41
+ }
42
+ if (')' !== character || 0 === depth) {
43
+ if (0 === depth) return {
44
+ unresolved: locator
45
+ };
46
+ continue;
47
+ }
48
+ depth -= 1;
49
+ if (0 === depth) {
50
+ const segment = context.slice(start, index);
51
+ if ('' === segment) return {
52
+ unresolved: locator
53
+ };
54
+ segments.push(segment);
55
+ start = -1;
56
+ }
57
+ }
58
+ if (0 !== depth || -1 !== start) return {
59
+ unresolved: locator
60
+ };
31
61
  const peers = [];
32
- let suffix = locator.slice(peerStart);
33
- while('' !== suffix){
34
- const match = /^\(([^()]+)\)/u.exec(suffix);
35
- if (!match) return {
36
- unresolved: locator
37
- };
38
- const peer = parsePackageLocator(match[1]);
62
+ for (const segment of segments){
63
+ if (/^patch_hash=[a-f0-9]{32,128}$/u.test(segment) || /^[a-f0-9]{32,128}$/u.test(segment)) continue;
64
+ const peer = parsePackageKey(segment);
39
65
  if (!peer) return {
40
66
  unresolved: locator
41
67
  };
42
68
  peers.push(peer);
43
- suffix = suffix.slice(match[0].length);
44
69
  }
45
70
  return {
46
71
  base: locator.slice(0, peerStart),
@@ -146,23 +171,17 @@ function discoverReachablePnpmLockReleaseAgeClosure(lockfile) {
146
171
  }
147
172
  const nodes = new Map();
148
173
  const nodeIdsByIdentity = new Map();
149
- const allNodeIds = new Set([
150
- ...packageRecords.keys(),
151
- ...snapshotRecords.keys()
152
- ]);
153
174
  for (const nodeId of [
154
- ...allNodeIds
175
+ ...snapshotRecords.keys()
155
176
  ].sort((left, right)=>left.localeCompare(right))){
156
177
  const identity = parsePackageKey(nodeId);
157
178
  if (!identity) continue;
179
+ const key = packageVersionKey(identity);
158
180
  nodes.set(nodeId, {
159
181
  identity,
160
- records: [
161
- packageRecords.get(nodeId),
162
- snapshotRecords.get(nodeId)
163
- ].filter((record)=>void 0 !== record)
182
+ packageRecords: (packageRecordsByIdentity.get(key) ?? []).map(([, record])=>record),
183
+ snapshotRecord: snapshotRecords.get(nodeId)
164
184
  });
165
- const key = packageVersionKey(identity);
166
185
  nodeIdsByIdentity.set(key, [
167
186
  ...nodeIdsByIdentity.get(key) ?? [],
168
187
  nodeId
@@ -216,16 +235,15 @@ function discoverReachablePnpmLockReleaseAgeClosure(lockfile) {
216
235
  const nodeId = queue.shift();
217
236
  const node = nodes.get(nodeId);
218
237
  const nodePath = shortestNodePaths.get(nodeId);
219
- if (!snapshotRecords.has(nodeId)) {
220
- recordUnresolved(node.identity, nodePath, 'missing lock snapshot');
221
- continue;
222
- }
223
- if (!packageRecords.has(nodeId)) {
238
+ if (0 === node.packageRecords.length) {
224
239
  recordUnresolved(node.identity, nodePath, 'missing lock package');
225
240
  continue;
226
241
  }
227
242
  for (const peer of node.identity.peers)enqueueIdentity(peer, nodePath);
228
- for (const record of node.records)for (const edge of dependencyEdges(record)){
243
+ for (const record of [
244
+ ...node.packageRecords,
245
+ node.snapshotRecord
246
+ ])for (const edge of dependencyEdges(record)){
229
247
  const identity = dependencyIdentity(edge.dependencyName, edge.descriptor);
230
248
  if (identity) {
231
249
  if ('unresolved' in identity) {
@@ -29,19 +29,44 @@ function splitPeerContext(locator) {
29
29
  base: locator,
30
30
  peers: []
31
31
  };
32
+ const context = locator.slice(peerStart);
33
+ const segments = [];
34
+ let start = -1;
35
+ let depth = 0;
36
+ for(let index = 0; index < context.length; index += 1){
37
+ const character = context[index];
38
+ if ('(' === character) {
39
+ if (0 === depth) start = index + 1;
40
+ depth += 1;
41
+ continue;
42
+ }
43
+ if (')' !== character || 0 === depth) {
44
+ if (0 === depth) return {
45
+ unresolved: locator
46
+ };
47
+ continue;
48
+ }
49
+ depth -= 1;
50
+ if (0 === depth) {
51
+ const segment = context.slice(start, index);
52
+ if ('' === segment) return {
53
+ unresolved: locator
54
+ };
55
+ segments.push(segment);
56
+ start = -1;
57
+ }
58
+ }
59
+ if (0 !== depth || -1 !== start) return {
60
+ unresolved: locator
61
+ };
32
62
  const peers = [];
33
- let suffix = locator.slice(peerStart);
34
- while('' !== suffix){
35
- const match = /^\(([^()]+)\)/u.exec(suffix);
36
- if (!match) return {
37
- unresolved: locator
38
- };
39
- const peer = parsePackageLocator(match[1]);
63
+ for (const segment of segments){
64
+ if (/^patch_hash=[a-f0-9]{32,128}$/u.test(segment) || /^[a-f0-9]{32,128}$/u.test(segment)) continue;
65
+ const peer = parsePackageKey(segment);
40
66
  if (!peer) return {
41
67
  unresolved: locator
42
68
  };
43
69
  peers.push(peer);
44
- suffix = suffix.slice(match[0].length);
45
70
  }
46
71
  return {
47
72
  base: locator.slice(0, peerStart),
@@ -147,23 +172,17 @@ function discoverReachablePnpmLockReleaseAgeClosure(lockfile) {
147
172
  }
148
173
  const nodes = new Map();
149
174
  const nodeIdsByIdentity = new Map();
150
- const allNodeIds = new Set([
151
- ...packageRecords.keys(),
152
- ...snapshotRecords.keys()
153
- ]);
154
175
  for (const nodeId of [
155
- ...allNodeIds
176
+ ...snapshotRecords.keys()
156
177
  ].sort((left, right)=>left.localeCompare(right))){
157
178
  const identity = parsePackageKey(nodeId);
158
179
  if (!identity) continue;
180
+ const key = packageVersionKey(identity);
159
181
  nodes.set(nodeId, {
160
182
  identity,
161
- records: [
162
- packageRecords.get(nodeId),
163
- snapshotRecords.get(nodeId)
164
- ].filter((record)=>void 0 !== record)
183
+ packageRecords: (packageRecordsByIdentity.get(key) ?? []).map(([, record])=>record),
184
+ snapshotRecord: snapshotRecords.get(nodeId)
165
185
  });
166
- const key = packageVersionKey(identity);
167
186
  nodeIdsByIdentity.set(key, [
168
187
  ...nodeIdsByIdentity.get(key) ?? [],
169
188
  nodeId
@@ -217,16 +236,15 @@ function discoverReachablePnpmLockReleaseAgeClosure(lockfile) {
217
236
  const nodeId = queue.shift();
218
237
  const node = nodes.get(nodeId);
219
238
  const nodePath = shortestNodePaths.get(nodeId);
220
- if (!snapshotRecords.has(nodeId)) {
221
- recordUnresolved(node.identity, nodePath, 'missing lock snapshot');
222
- continue;
223
- }
224
- if (!packageRecords.has(nodeId)) {
239
+ if (0 === node.packageRecords.length) {
225
240
  recordUnresolved(node.identity, nodePath, 'missing lock package');
226
241
  continue;
227
242
  }
228
243
  for (const peer of node.identity.peers)enqueueIdentity(peer, nodePath);
229
- for (const record of node.records)for (const edge of dependencyEdges(record)){
244
+ for (const record of [
245
+ ...node.packageRecords,
246
+ node.snapshotRecord
247
+ ])for (const edge of dependencyEdges(record)){
230
248
  const identity = dependencyIdentity(edge.dependencyName, edge.descriptor);
231
249
  if (identity) {
232
250
  if ('unresolved' in identity) {
package/package.json CHANGED
@@ -21,7 +21,7 @@
21
21
  "engines": {
22
22
  "node": ">=20"
23
23
  },
24
- "version": "3.5.0-ultramodern.77",
24
+ "version": "3.5.0-ultramodern.79",
25
25
  "types": "./dist/types/index.d.ts",
26
26
  "main": "./dist/esm-node/index.js",
27
27
  "bin": {
@@ -75,8 +75,8 @@
75
75
  ],
76
76
  "dependencies": {
77
77
  "@modern-js/codesmith": "2.6.9",
78
- "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.5.0-ultramodern.77",
79
- "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.77",
78
+ "@modern-js/i18n-utils": "npm:@bleedingdev/modern-js-i18n-utils@3.5.0-ultramodern.79",
79
+ "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.5.0-ultramodern.79",
80
80
  "esbuild": "^0.28.1",
81
81
  "oxfmt": "0.58.0",
82
82
  "ultracite": "7.9.3"
@@ -101,6 +101,6 @@
101
101
  "type-check": "tsgo --noEmit -p tsconfig.json"
102
102
  },
103
103
  "ultramodern": {
104
- "frameworkVersion": "3.5.0-ultramodern.77"
104
+ "frameworkVersion": "3.5.0-ultramodern.79"
105
105
  }
106
106
  }
@@ -37,172 +37,172 @@
37
37
  {
38
38
  "sourceName": "@modern-js/adapter-rstest",
39
39
  "targetName": "@bleedingdev/modern-js-adapter-rstest",
40
- "version": "3.5.0-ultramodern.77"
40
+ "version": "3.5.0-ultramodern.79"
41
41
  },
42
42
  {
43
43
  "sourceName": "@modern-js/app-tools",
44
44
  "targetName": "@bleedingdev/modern-js-app-tools",
45
- "version": "3.5.0-ultramodern.77"
45
+ "version": "3.5.0-ultramodern.79"
46
46
  },
47
47
  {
48
48
  "sourceName": "@modern-js/bff-core",
49
49
  "targetName": "@bleedingdev/modern-js-bff-core",
50
- "version": "3.5.0-ultramodern.77"
50
+ "version": "3.5.0-ultramodern.79"
51
51
  },
52
52
  {
53
53
  "sourceName": "@modern-js/bff-runtime",
54
54
  "targetName": "@bleedingdev/modern-js-bff-runtime",
55
- "version": "3.5.0-ultramodern.77"
55
+ "version": "3.5.0-ultramodern.79"
56
56
  },
57
57
  {
58
58
  "sourceName": "@modern-js/builder",
59
59
  "targetName": "@bleedingdev/modern-js-builder",
60
- "version": "3.5.0-ultramodern.77"
60
+ "version": "3.5.0-ultramodern.79"
61
61
  },
62
62
  {
63
63
  "sourceName": "@modern-js/code-tools",
64
64
  "targetName": "@bleedingdev/modern-js-code-tools",
65
- "version": "3.5.0-ultramodern.77"
65
+ "version": "3.5.0-ultramodern.79"
66
66
  },
67
67
  {
68
68
  "sourceName": "@modern-js/create",
69
69
  "targetName": "@bleedingdev/modern-js-create",
70
- "version": "3.5.0-ultramodern.77"
70
+ "version": "3.5.0-ultramodern.79"
71
71
  },
72
72
  {
73
73
  "sourceName": "@modern-js/create-request",
74
74
  "targetName": "@bleedingdev/modern-js-create-request",
75
- "version": "3.5.0-ultramodern.77"
75
+ "version": "3.5.0-ultramodern.79"
76
76
  },
77
77
  {
78
78
  "sourceName": "@modern-js/i18n-utils",
79
79
  "targetName": "@bleedingdev/modern-js-i18n-utils",
80
- "version": "3.5.0-ultramodern.77"
80
+ "version": "3.5.0-ultramodern.79"
81
81
  },
82
82
  {
83
83
  "sourceName": "@modern-js/image",
84
84
  "targetName": "@bleedingdev/modern-js-image",
85
- "version": "3.5.0-ultramodern.77"
85
+ "version": "3.5.0-ultramodern.79"
86
86
  },
87
87
  {
88
88
  "sourceName": "@modern-js/main-doc",
89
89
  "targetName": "@bleedingdev/modern-js-main-doc",
90
- "version": "3.5.0-ultramodern.77"
90
+ "version": "3.5.0-ultramodern.79"
91
91
  },
92
92
  {
93
93
  "sourceName": "@modern-js/plugin",
94
94
  "targetName": "@bleedingdev/modern-js-plugin",
95
- "version": "3.5.0-ultramodern.77"
95
+ "version": "3.5.0-ultramodern.79"
96
96
  },
97
97
  {
98
98
  "sourceName": "@modern-js/plugin-bff",
99
99
  "targetName": "@bleedingdev/modern-js-plugin-bff",
100
- "version": "3.5.0-ultramodern.77"
100
+ "version": "3.5.0-ultramodern.79"
101
101
  },
102
102
  {
103
103
  "sourceName": "@modern-js/plugin-data-loader",
104
104
  "targetName": "@bleedingdev/modern-js-plugin-data-loader",
105
- "version": "3.5.0-ultramodern.77"
105
+ "version": "3.5.0-ultramodern.79"
106
106
  },
107
107
  {
108
108
  "sourceName": "@modern-js/plugin-i18n",
109
109
  "targetName": "@bleedingdev/modern-js-plugin-i18n",
110
- "version": "3.5.0-ultramodern.77"
110
+ "version": "3.5.0-ultramodern.79"
111
111
  },
112
112
  {
113
113
  "sourceName": "@modern-js/plugin-polyfill",
114
114
  "targetName": "@bleedingdev/modern-js-plugin-polyfill",
115
- "version": "3.5.0-ultramodern.77"
115
+ "version": "3.5.0-ultramodern.79"
116
116
  },
117
117
  {
118
118
  "sourceName": "@modern-js/plugin-ssg",
119
119
  "targetName": "@bleedingdev/modern-js-plugin-ssg",
120
- "version": "3.5.0-ultramodern.77"
120
+ "version": "3.5.0-ultramodern.79"
121
121
  },
122
122
  {
123
123
  "sourceName": "@modern-js/plugin-styled-components",
124
124
  "targetName": "@bleedingdev/modern-js-plugin-styled-components",
125
- "version": "3.5.0-ultramodern.77"
125
+ "version": "3.5.0-ultramodern.79"
126
126
  },
127
127
  {
128
128
  "sourceName": "@modern-js/plugin-tanstack",
129
129
  "targetName": "@bleedingdev/modern-js-plugin-tanstack",
130
- "version": "3.5.0-ultramodern.77"
130
+ "version": "3.5.0-ultramodern.79"
131
131
  },
132
132
  {
133
133
  "sourceName": "@modern-js/prod-server",
134
134
  "targetName": "@bleedingdev/modern-js-prod-server",
135
- "version": "3.5.0-ultramodern.77"
135
+ "version": "3.5.0-ultramodern.79"
136
136
  },
137
137
  {
138
138
  "sourceName": "@modern-js/render",
139
139
  "targetName": "@bleedingdev/modern-js-render",
140
- "version": "3.5.0-ultramodern.77"
140
+ "version": "3.5.0-ultramodern.79"
141
141
  },
142
142
  {
143
143
  "sourceName": "@modern-js/runtime",
144
144
  "targetName": "@bleedingdev/modern-js-runtime",
145
- "version": "3.5.0-ultramodern.77"
145
+ "version": "3.5.0-ultramodern.79"
146
146
  },
147
147
  {
148
148
  "sourceName": "@modern-js/runtime-utils",
149
149
  "targetName": "@bleedingdev/modern-js-runtime-utils",
150
- "version": "3.5.0-ultramodern.77"
150
+ "version": "3.5.0-ultramodern.79"
151
151
  },
152
152
  {
153
153
  "sourceName": "@modern-js/sandpack-react",
154
154
  "targetName": "@bleedingdev/modern-js-sandpack-react",
155
- "version": "3.5.0-ultramodern.77"
155
+ "version": "3.5.0-ultramodern.79"
156
156
  },
157
157
  {
158
158
  "sourceName": "@modern-js/server",
159
159
  "targetName": "@bleedingdev/modern-js-server",
160
- "version": "3.5.0-ultramodern.77"
160
+ "version": "3.5.0-ultramodern.79"
161
161
  },
162
162
  {
163
163
  "sourceName": "@modern-js/server-core",
164
164
  "targetName": "@bleedingdev/modern-js-server-core",
165
- "version": "3.5.0-ultramodern.77"
165
+ "version": "3.5.0-ultramodern.79"
166
166
  },
167
167
  {
168
168
  "sourceName": "@modern-js/server-runtime",
169
169
  "targetName": "@bleedingdev/modern-js-server-runtime",
170
- "version": "3.5.0-ultramodern.77"
170
+ "version": "3.5.0-ultramodern.79"
171
171
  },
172
172
  {
173
173
  "sourceName": "@modern-js/server-runtime-extensions",
174
174
  "targetName": "@bleedingdev/modern-js-server-runtime-extensions",
175
- "version": "3.5.0-ultramodern.77"
175
+ "version": "3.5.0-ultramodern.79"
176
176
  },
177
177
  {
178
178
  "sourceName": "@modern-js/server-utils",
179
179
  "targetName": "@bleedingdev/modern-js-server-utils",
180
- "version": "3.5.0-ultramodern.77"
180
+ "version": "3.5.0-ultramodern.79"
181
181
  },
182
182
  {
183
183
  "sourceName": "@modern-js/tsconfig",
184
184
  "targetName": "@bleedingdev/modern-js-tsconfig",
185
- "version": "3.5.0-ultramodern.77"
185
+ "version": "3.5.0-ultramodern.79"
186
186
  },
187
187
  {
188
188
  "sourceName": "@modern-js/types",
189
189
  "targetName": "@bleedingdev/modern-js-types",
190
- "version": "3.5.0-ultramodern.77"
190
+ "version": "3.5.0-ultramodern.79"
191
191
  },
192
192
  {
193
193
  "sourceName": "@modern-js/utils",
194
194
  "targetName": "@bleedingdev/modern-js-utils",
195
- "version": "3.5.0-ultramodern.77"
195
+ "version": "3.5.0-ultramodern.79"
196
196
  }
197
197
  ],
198
198
  "release": {
199
199
  "tag": "latest",
200
- "version": "3.5.0-ultramodern.77"
200
+ "version": "3.5.0-ultramodern.79"
201
201
  },
202
202
  "schema": "bleedingdev.ultramodern.release-cohort",
203
203
  "schemaVersion": 1,
204
204
  "source": {
205
- "commit": "7d0b9ead1c92b32db981361f9280accfed45a9d5",
205
+ "commit": "a7c4ca3feeb2656183afdb5860d7032001b789d9",
206
206
  "repository": "BleedingDev/ultramodern.js"
207
207
  }
208
208
  }