@base44-preview/vite-plugin 0.2.26-pr.43.554d4c7 → 0.2.26-pr.43.79e9508
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.
- package/dist/processors/collection-item-field-processor.d.ts +5 -0
- package/dist/processors/collection-item-field-processor.d.ts.map +1 -1
- package/dist/processors/collection-item-field-processor.js +37 -2
- package/dist/processors/collection-item-field-processor.js.map +1 -1
- package/package.json +1 -1
- package/src/processors/collection-item-field-processor.ts +60 -2
|
@@ -16,6 +16,11 @@ export declare class DataItemFieldProcessor {
|
|
|
16
16
|
private extractFromImageElement;
|
|
17
17
|
private extractFromConditionalImage;
|
|
18
18
|
private tryAddItemId;
|
|
19
|
+
/**
|
|
20
|
+
* For simple identifiers from destructured component props like ({ name, price }),
|
|
21
|
+
* find or inject _id in the ObjectPattern so we can reference it directly.
|
|
22
|
+
*/
|
|
23
|
+
private tryAddItemIdFromDestructuredParams;
|
|
19
24
|
private tryAddItemIdFromParentComponent;
|
|
20
25
|
private findKeyWithId;
|
|
21
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collection-item-field-processor.d.ts","sourceRoot":"","sources":["../../src/processors/collection-item-field-processor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,KAAK,CAAC,MAAM,cAAc,CAAC;AAavC,qBAAa,sBAAsB;IAKrB,OAAO,CAAC,KAAK;IAJzB,OAAO,CAAC,cAAc,CAAoB;IAC1C,OAAO,CAAC,eAAe,CAA0B;IACjD,OAAO,CAAC,WAAW,CAAmB;gBAElB,KAAK,EAAE,OAAO,CAAC;IAMnC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,iBAAiB,CAAC,GAAG,IAAI;IAoBlD,OAAO,CAAC,wBAAwB;IAahC,OAAO,CAAC,qBAAqB;IAc7B,OAAO,CAAC,8BAA8B;IAwCtC,OAAO,CAAC,2BAA2B;IA0BnC,OAAO,CAAC,2BAA2B;IAUnC,OAAO,CAAC,uBAAuB;IAqB/B,OAAO,CAAC,uBAAuB;IAyC/B,OAAO,CAAC,2BAA2B;IAUnC,OAAO,CAAC,YAAY;
|
|
1
|
+
{"version":3,"file":"collection-item-field-processor.d.ts","sourceRoot":"","sources":["../../src/processors/collection-item-field-processor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,KAAK,CAAC,MAAM,cAAc,CAAC;AAavC,qBAAa,sBAAsB;IAKrB,OAAO,CAAC,KAAK;IAJzB,OAAO,CAAC,cAAc,CAAoB;IAC1C,OAAO,CAAC,eAAe,CAA0B;IACjD,OAAO,CAAC,WAAW,CAAmB;gBAElB,KAAK,EAAE,OAAO,CAAC;IAMnC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,iBAAiB,CAAC,GAAG,IAAI;IAoBlD,OAAO,CAAC,wBAAwB;IAahC,OAAO,CAAC,qBAAqB;IAc7B,OAAO,CAAC,8BAA8B;IAwCtC,OAAO,CAAC,2BAA2B;IA0BnC,OAAO,CAAC,2BAA2B;IAUnC,OAAO,CAAC,uBAAuB;IAqB/B,OAAO,CAAC,uBAAuB;IAyC/B,OAAO,CAAC,2BAA2B;IAUnC,OAAO,CAAC,YAAY;IA2CpB;;;OAGG;IACH,OAAO,CAAC,kCAAkC;IA6C1C,OAAO,CAAC,+BAA+B;IA+BvC,OAAO,CAAC,aAAa;CAuBtB"}
|
|
@@ -23,7 +23,7 @@ export class DataItemFieldProcessor {
|
|
|
23
23
|
if (!result)
|
|
24
24
|
return;
|
|
25
25
|
this.attributeUtils.addStringAttribute(path, DATA_COLLECTION_ITEM_FIELD, result.fieldPath);
|
|
26
|
-
this.tryAddItemId(path, result.rootIdentifier);
|
|
26
|
+
this.tryAddItemId(path, result.rootIdentifier, result.fieldPath);
|
|
27
27
|
}
|
|
28
28
|
extractFieldFromChildren(jsxElement) {
|
|
29
29
|
const children = jsxElement.get("children");
|
|
@@ -151,10 +151,18 @@ export class DataItemFieldProcessor {
|
|
|
151
151
|
}
|
|
152
152
|
return null;
|
|
153
153
|
}
|
|
154
|
-
tryAddItemId(path, rootIdentifier) {
|
|
154
|
+
tryAddItemId(path, rootIdentifier, fieldPath) {
|
|
155
155
|
if (this.attributeUtils.hasAttribute(path, DATA_COLLECTION_ITEM_ID)) {
|
|
156
156
|
return;
|
|
157
157
|
}
|
|
158
|
+
// Simple identifier: {name} from ({ name, price }) => ...
|
|
159
|
+
// rootIdentifier IS the field value (a string), not an object with _id.
|
|
160
|
+
// We need to find _id from sibling destructured params instead.
|
|
161
|
+
if (rootIdentifier.name === fieldPath) {
|
|
162
|
+
this.tryAddItemIdFromDestructuredParams(path);
|
|
163
|
+
return;
|
|
164
|
+
}
|
|
165
|
+
// Member expression: {product.name} → product?._id
|
|
158
166
|
const idExpr = this.types.optionalMemberExpression(this.types.identifier(rootIdentifier.name), this.types.identifier("_id"), false, true);
|
|
159
167
|
const binding = path.scope.getBinding(rootIdentifier.name);
|
|
160
168
|
if (!binding) {
|
|
@@ -164,6 +172,33 @@ export class DataItemFieldProcessor {
|
|
|
164
172
|
if (binding.path.isVariableDeclarator() ||
|
|
165
173
|
binding.kind === "param") {
|
|
166
174
|
this.attributeUtils.addExpressionAttribute(path, DATA_COLLECTION_ITEM_ID, idExpr);
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
/**
|
|
178
|
+
* For simple identifiers from destructured component props like ({ name, price }),
|
|
179
|
+
* find or inject _id in the ObjectPattern so we can reference it directly.
|
|
180
|
+
*/
|
|
181
|
+
tryAddItemIdFromDestructuredParams(path) {
|
|
182
|
+
const fn = path.getFunctionParent();
|
|
183
|
+
if (!fn)
|
|
184
|
+
return;
|
|
185
|
+
const params = fn.get("params");
|
|
186
|
+
for (const param of Array.isArray(params) ? params : [params]) {
|
|
187
|
+
if (!param.isObjectPattern())
|
|
188
|
+
continue;
|
|
189
|
+
// Check if _id is already destructured
|
|
190
|
+
for (const prop of param.get("properties")) {
|
|
191
|
+
if (prop.isObjectProperty() &&
|
|
192
|
+
this.types.isIdentifier(prop.node.key) &&
|
|
193
|
+
prop.node.key.name === "_id" &&
|
|
194
|
+
this.types.isIdentifier(prop.node.value)) {
|
|
195
|
+
this.attributeUtils.addExpressionAttribute(path, DATA_COLLECTION_ITEM_ID, this.types.identifier(prop.node.value.name));
|
|
196
|
+
return;
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
// _id not destructured yet — inject it into the pattern
|
|
200
|
+
param.node.properties.push(this.types.objectProperty(this.types.identifier("_id"), this.types.identifier("_id"), false, true));
|
|
201
|
+
this.attributeUtils.addExpressionAttribute(path, DATA_COLLECTION_ITEM_ID, this.types.identifier("_id"));
|
|
167
202
|
return;
|
|
168
203
|
}
|
|
169
204
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collection-item-field-processor.js","sourceRoot":"","sources":["../../src/processors/collection-item-field-processor.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,0BAA0B,EAC1B,uBAAuB,EACvB,eAAe,GAChB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EACL,iBAAiB,EACjB,uBAAuB,EACvB,gBAAgB,GACjB,MAAM,mBAAmB,CAAC;AAE3B,MAAM,OAAO,sBAAsB;IAKb;IAJZ,cAAc,CAAoB;IAClC,eAAe,CAA0B;IACzC,WAAW,CAAmB;IAEtC,YAAoB,KAAe;QAAf,UAAK,GAAL,KAAK,CAAU;QACjC,IAAI,CAAC,cAAc,GAAG,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAC;QACnD,IAAI,CAAC,eAAe,GAAG,IAAI,uBAAuB,CAAC,KAAK,CAAC,CAAC;QAC1D,IAAI,CAAC,WAAW,GAAG,IAAI,gBAAgB,CAAC,KAAK,CAAC,CAAC;IACjD,CAAC;IAED,OAAO,CAAC,IAAmC;QACzC,IAAI,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,IAAI,EAAE,0BAA0B,CAAC,EAAE,CAAC;YACvE,OAAO;QACT,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QACnC,IAAI,CAAC,UAAU,EAAE,YAAY,EAAE;YAAE,OAAO;QAExC,MAAM,MAAM,GAAG,IAAI,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;QACzD,IAAI,CAAC,MAAM;YAAE,OAAO;QAEpB,IAAI,CAAC,cAAc,CAAC,kBAAkB,CACpC,IAAI,EACJ,0BAA0B,EAC1B,MAAM,CAAC,SAAS,CACjB,CAAC;QAEF,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,cAAc,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"collection-item-field-processor.js","sourceRoot":"","sources":["../../src/processors/collection-item-field-processor.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -40,7 +40,7 @@ export class DataItemFieldProcessor {
|
|
|
40
40
|
result.fieldPath
|
|
41
41
|
);
|
|
42
42
|
|
|
43
|
-
this.tryAddItemId(path, result.rootIdentifier);
|
|
43
|
+
this.tryAddItemId(path, result.rootIdentifier, result.fieldPath);
|
|
44
44
|
}
|
|
45
45
|
|
|
46
46
|
private extractFieldFromChildren(
|
|
@@ -220,12 +220,22 @@ export class DataItemFieldProcessor {
|
|
|
220
220
|
|
|
221
221
|
private tryAddItemId(
|
|
222
222
|
path: NodePath<t.JSXOpeningElement>,
|
|
223
|
-
rootIdentifier: t.Identifier
|
|
223
|
+
rootIdentifier: t.Identifier,
|
|
224
|
+
fieldPath: string
|
|
224
225
|
): void {
|
|
225
226
|
if (this.attributeUtils.hasAttribute(path, DATA_COLLECTION_ITEM_ID)) {
|
|
226
227
|
return;
|
|
227
228
|
}
|
|
228
229
|
|
|
230
|
+
// Simple identifier: {name} from ({ name, price }) => ...
|
|
231
|
+
// rootIdentifier IS the field value (a string), not an object with _id.
|
|
232
|
+
// We need to find _id from sibling destructured params instead.
|
|
233
|
+
if (rootIdentifier.name === fieldPath) {
|
|
234
|
+
this.tryAddItemIdFromDestructuredParams(path);
|
|
235
|
+
return;
|
|
236
|
+
}
|
|
237
|
+
|
|
238
|
+
// Member expression: {product.name} → product?._id
|
|
229
239
|
const idExpr = this.types.optionalMemberExpression(
|
|
230
240
|
this.types.identifier(rootIdentifier.name),
|
|
231
241
|
this.types.identifier("_id"),
|
|
@@ -248,6 +258,54 @@ export class DataItemFieldProcessor {
|
|
|
248
258
|
DATA_COLLECTION_ITEM_ID,
|
|
249
259
|
idExpr
|
|
250
260
|
);
|
|
261
|
+
}
|
|
262
|
+
}
|
|
263
|
+
|
|
264
|
+
/**
|
|
265
|
+
* For simple identifiers from destructured component props like ({ name, price }),
|
|
266
|
+
* find or inject _id in the ObjectPattern so we can reference it directly.
|
|
267
|
+
*/
|
|
268
|
+
private tryAddItemIdFromDestructuredParams(
|
|
269
|
+
path: NodePath<t.JSXOpeningElement>
|
|
270
|
+
): void {
|
|
271
|
+
const fn = path.getFunctionParent();
|
|
272
|
+
if (!fn) return;
|
|
273
|
+
|
|
274
|
+
const params = fn.get("params");
|
|
275
|
+
for (const param of Array.isArray(params) ? params : [params]) {
|
|
276
|
+
if (!param.isObjectPattern()) continue;
|
|
277
|
+
|
|
278
|
+
// Check if _id is already destructured
|
|
279
|
+
for (const prop of param.get("properties")) {
|
|
280
|
+
if (
|
|
281
|
+
prop.isObjectProperty() &&
|
|
282
|
+
this.types.isIdentifier(prop.node.key) &&
|
|
283
|
+
prop.node.key.name === "_id" &&
|
|
284
|
+
this.types.isIdentifier(prop.node.value)
|
|
285
|
+
) {
|
|
286
|
+
this.attributeUtils.addExpressionAttribute(
|
|
287
|
+
path,
|
|
288
|
+
DATA_COLLECTION_ITEM_ID,
|
|
289
|
+
this.types.identifier(prop.node.value.name)
|
|
290
|
+
);
|
|
291
|
+
return;
|
|
292
|
+
}
|
|
293
|
+
}
|
|
294
|
+
|
|
295
|
+
// _id not destructured yet — inject it into the pattern
|
|
296
|
+
param.node.properties.push(
|
|
297
|
+
this.types.objectProperty(
|
|
298
|
+
this.types.identifier("_id"),
|
|
299
|
+
this.types.identifier("_id"),
|
|
300
|
+
false,
|
|
301
|
+
true
|
|
302
|
+
)
|
|
303
|
+
);
|
|
304
|
+
this.attributeUtils.addExpressionAttribute(
|
|
305
|
+
path,
|
|
306
|
+
DATA_COLLECTION_ITEM_ID,
|
|
307
|
+
this.types.identifier("_id")
|
|
308
|
+
);
|
|
251
309
|
return;
|
|
252
310
|
}
|
|
253
311
|
}
|