Skip to content

Commit 74b7101

Browse files
committed
Simplify JS template by removing aliasing
1 parent 12a668b commit 74b7101

8 files changed

+26
-26
lines changed

discounts/javascript/discount/default/shopify.extension.toml.liquid

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ description = "t:description"
99

1010
[[extensions.targeting]]
1111
target = "cart.lines.discounts.generate.run"
12-
input_query = "src/generate_cart_run.graphql"
13-
export = "generate-cart-run"
12+
input_query = "src/cart_lines_discounts_generate_run.graphql"
13+
export = "cart-lines-discounts-generate-run"
1414

1515
[[extensions.targeting]]
1616
target = "cart.delivery-options.discounts.generate.run"
17-
input_query = "src/generate_delivery_run.graphql"
18-
export = "generate-delivery-run"
17+
input_query = "src/cart_delivery_options_discounts_generate_run.graphql"
18+
export = "cart-delivery-options-discounts-generate-run"
1919

2020
[extensions.build]
2121
command = ""

discounts/javascript/discount/default/src/generate_delivery_run.liquid renamed to discounts/javascript/discount/default/src/cart_delivery_options_discounts_generate_run.liquid

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import { DeliveryDiscountSelectionStrategy} from '../generated/api';
88
* @typedef {import("../generated/api").CartDeliveryOptionsDiscountsGenerateRunResult} CartDeliveryOptionsDiscountsGenerateRunResult
99
*/
1010
/**
11-
* generateDeliveryRun
11+
* cartDeliveryOptionsDiscountsGenerateRun
1212
* @param {RunInput} input - The DeliveryInput
1313
* @returns {CartDeliveryOptionsDiscountsGenerateRunResult} - The function result with discounts.
1414
*/
15-
export function generateDeliveryRun(input) {
15+
export function cartDeliveryOptionsDiscountsGenerateRun(input) {
1616
const firstDeliveryGroup = input.cart.deliveryGroups[0];
1717
if (!firstDeliveryGroup) {
1818
throw new Error('No delivery groups found');
@@ -51,7 +51,7 @@ import {
5151
CartDeliveryOptionsDiscountsGenerateRunResult,
5252
} from '../generated/api';
5353

54-
export function generateDeliveryRun(
54+
export function cartDeliveryOptionsDiscountsGenerateRun(
5555
input: DeliveryInput,
5656
): CartDeliveryOptionsDiscountsGenerateRunResult {
5757
const firstDeliveryGroup = input.cart.deliveryGroups[0];

discounts/javascript/discount/default/src/generate_delivery_run.test.liquid renamed to discounts/javascript/discount/default/src/cart_delivery_options_discounts_generate_run.test.liquid

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{%- if flavor contains "vanilla-js" -%}
22
import { describe, it, expect } from "vitest";
33

4-
import { generateDeliveryRun } from "./generate_delivery_run";
4+
import { cartDeliveryOptionsDiscountsGenerateRun } from "./cart_delivery_options_discounts_generate_run";
55
import {
66
DeliveryDiscountSelectionStrategy,
77
} from "../generated/api";
@@ -11,7 +11,7 @@ import {
1111
* @typedef {import("../generated/api").DeliveryInput} DeliveryInput
1212
*/
1313

14-
describe("generateDeliveryRun", () => {
14+
describe("cartDeliveryOptionsDiscountsGenerateRun", () => {
1515
it("returns a delivery discount", () => {
1616
const input = /** @type {DeliveryInput} */ ({
1717
cart: {
@@ -23,7 +23,7 @@ describe("generateDeliveryRun", () => {
2323
},
2424
});
2525

26-
const result = generateDeliveryRun(input);
26+
const result = cartDeliveryOptionsDiscountsGenerateRun(input);
2727

2828
expect(result.operations.length).toBe(1);
2929
expect(result.operations[0]).toMatchObject({
@@ -53,14 +53,14 @@ describe("generateDeliveryRun", () => {
5353
{%- elsif flavor contains "typescript" -%}
5454
import { describe, it, expect } from "vitest";
5555

56-
import { generateDeliveryRun } from "./generate_delivery_run";
56+
import { cartDeliveryOptionsDiscountsGenerateRun } from "./cart_delivery_options_discounts_generate_run";
5757
import {
5858
DeliveryDiscountSelectionStrategy,
5959
DeliveryInput,
6060
CartDeliveryOptionsDiscountsGenerateRunResult
6161
} from "../generated/api";
6262

63-
describe("generateDeliveryRun", () => {
63+
describe("cartDeliveryOptionsDiscountsGenerateRun", () => {
6464
it("returns a delivery discount", () => {
6565
const input: DeliveryInput = {
6666
cart: {
@@ -72,7 +72,7 @@ describe("generateDeliveryRun", () => {
7272
},
7373
};
7474

75-
const result: CartDeliveryOptionsDiscountsGenerateRunResult = generateDeliveryRun(input);
75+
const result: CartDeliveryOptionsDiscountsGenerateRunResult = cartDeliveryOptionsDiscountsGenerateRun(input);
7676

7777
expect(result.operations.length).toBe(1);
7878
expect(result.operations[0]).toMatchObject({
@@ -99,4 +99,4 @@ describe("generateDeliveryRun", () => {
9999
});
100100
});
101101
});
102-
{%- endif -%}
102+
{%- endif -%}

discounts/javascript/discount/default/src/generate_cart_run.liquid renamed to discounts/javascript/discount/default/src/cart_lines_discounts_generate_run.liquid

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import {
1212
*/
1313

1414
/**
15-
* generateCartRun
15+
* cartLinesDiscountsGenerateRun
1616
* @param {CartInput} input - The CartInput
1717
* @returns {CartLinesDiscountsGenerateRunResult} - The function result with discounts.
1818
*/
19-
export function generateCartRun(input) {
19+
export function cartLinesDiscountsGenerateRun(input) {
2020
if (!input.cart.lines.length) {
2121
throw new Error('No cart lines found');
2222
}
@@ -83,7 +83,7 @@ import {
8383
CartLinesDiscountsGenerateRunResult,
8484
} from '../generated/api';
8585

86-
export function generateCartRun(input: CartInput): CartLinesDiscountsGenerateRunResult {
86+
export function cartLinesDiscountsGenerateRun(input: CartInput): CartLinesDiscountsGenerateRunResult {
8787
if (!input.cart.lines.length) {
8888
throw new Error('No cart lines found');
8989
}

discounts/javascript/discount/default/src/generate_cart_run.test.liquid renamed to discounts/javascript/discount/default/src/cart_lines_discounts_generate_run.test.liquid

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{%- if flavor contains "vanilla-js" -%}
22
import { describe, it, expect } from "vitest";
33

4-
import { generateCartRun } from "./generate_cart_run";
4+
import { cartLinesDiscountsGenerateRun } from "./cart_lines_discounts_generate_run";
55
import {
66
OrderDiscountSelectionStrategy,
77
ProductDiscountSelectionStrategy,
@@ -11,7 +11,7 @@ import {
1111
* @typedef {import("../generated/api").CartLinesDiscountsGenerateRunResult} CartLinesDiscountsGenerateRunResult
1212
*/
1313

14-
describe("generateCartRun", () => {
14+
describe("cartLinesDiscountsGenerateRun", () => {
1515
it("returns a product and order discount", () => {
1616
const input = {
1717
cart: {
@@ -26,7 +26,7 @@ describe("generateCartRun", () => {
2626
},
2727
};
2828

29-
const result = generateCartRun(input);
29+
const result = cartLinesDiscountsGenerateRun(input);
3030

3131
expect(result.operations.length).toBe(2);
3232
expect(result.operations[0]).toMatchObject({
@@ -79,15 +79,15 @@ describe("generateCartRun", () => {
7979
{%- elsif flavor contains "typescript" -%}
8080
import { describe, it, expect } from "vitest";
8181

82-
import { generateCartRun } from "./generate_cart_run";
82+
import { cartLinesDiscountsGenerateRun } from "./cart_lines_discounts_generate_run";
8383
import {
8484
OrderDiscountSelectionStrategy,
8585
ProductDiscountSelectionStrategy,
8686
CartInput,
8787
CartLinesDiscountsGenerateRunResult
8888
} from "../generated/api";
8989

90-
describe("generateCartRun", () => {
90+
describe("cartLinesDiscountsGenerateRun", () => {
9191
it("returns a product and order discount", () => {
9292
const input: CartInput = {
9393
cart: {
@@ -102,7 +102,7 @@ describe("generateCartRun", () => {
102102
},
103103
};
104104

105-
const result: CartLinesDiscountsGenerateRunResult = generateCartRun(input);
105+
const result: CartLinesDiscountsGenerateRunResult = cartLinesDiscountsGenerateRun(input);
106106

107107
expect(result.operations.length).toBe(2);
108108
expect(result.operations[0]).toMatchObject({
@@ -152,4 +152,4 @@ describe("generateCartRun", () => {
152152
});
153153
});
154154
});
155-
{%- endif -%}
155+
{%- endif -%}
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
export * from './generate_cart_run';
2-
export * from './generate_delivery_run';
1+
export * from './cart_lines_discounts_generate_run';
2+
export * from './cart_delivery_options_discounts_generate_run';

0 commit comments

Comments
 (0)