Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Fix CI: sync product_scopes.rb, SDK types and TS version with main

Damian Legawiecfd734b917308
diff --git a/packages/sdk/package-lock.json b/packages/sdk/package-lock.json
index c13167a8ef..9f8bb22b4c 100644
--- a/packages/sdk/package-lock.json
+++ b/packages/sdk/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "@spree/sdk",
- "version": "0.6.9",
+ "version": "0.5.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@spree/sdk",
- "version": "0.6.9",
+ "version": "0.5.0",
"license": "MIT",
"devDependencies": {
"@changesets/changelog-github": "^0.5.2",
@@ -18,7 +18,6 @@
"tsx": "^4.0.0",
"typescript": "^5.3.0",
"vitest": "^4.0.18",
- "yaml": "^2.8.2",
"zod": "^4.3.6"
},
"engines": {
@@ -4074,22 +4073,6 @@
"node": ">=10"
}
},
- "node_modules/yaml": {
- "version": "2.8.2",
- "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.2.tgz",
- "integrity": "sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A==",
- "dev": true,
- "license": "ISC",
- "bin": {
- "yaml": "bin.mjs"
- },
- "engines": {
- "node": ">= 14.6"
- },
- "funding": {
- "url": "https://github.com/sponsors/eemeli"
- }
- },
"node_modules/yargs": {
"version": "17.7.2",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 0f0aa1f551..fbffb1018a 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -96,8 +96,8 @@
"msw": "^2.12.14",
"tsup": "^8.0.0",
"tsx": "^4.0.0",
- "typescript": "^5.3.0",
- "vitest": "^4.0.18",
+ "typescript": "^6.0.2",
+ "vitest": "^4.1.2",
"zod": "^4.3.6"
},
"peerDependencies": {
diff --git a/packages/sdk/src/types/generated/CustomField.ts b/packages/sdk/src/types/generated/CustomField.ts
index b80fb464fb..6d7662bdf2 100644
--- a/packages/sdk/src/types/generated/CustomField.ts
+++ b/packages/sdk/src/types/generated/CustomField.ts
@@ -1,4 +1,4 @@
-// Typelizer digest db0ebd33c5b5645134926a31605cd35e
+// Typelizer digest 3ac7ee503478b30fbadc8402bc8452bf
//
// DO NOT MODIFY: This file was automatically generated by Typelizer.
@@ -8,7 +8,6 @@ interface CustomField {
type: string;
key: string;
value: any;
- display_on: string;
}
export default CustomField;
diff --git a/packages/sdk/src/types/generated/Product.ts b/packages/sdk/src/types/generated/Product.ts
index 568093540b..e9700ed93d 100644
--- a/packages/sdk/src/types/generated/Product.ts
+++ b/packages/sdk/src/types/generated/Product.ts
@@ -1,4 +1,4 @@
-// Typelizer digest 91825afbdee8d60521a89338e3d8b720
+// Typelizer digest 46e3c9a583ee8b9c7ccda6cc8a7eec16
//
// DO NOT MODIFY: This file was automatically generated by Typelizer.
import type {Price, PriceHistory, Media, Variant, OptionType, Category, CustomField} from '@/types'
diff --git a/packages/sdk/src/types/generated/index.ts b/packages/sdk/src/types/generated/index.ts
index aeec9c1e8e..fe870afe33 100644
--- a/packages/sdk/src/types/generated/index.ts
+++ b/packages/sdk/src/types/generated/index.ts
@@ -1,4 +1,4 @@
-// Typelizer digest a8e62bfbf876a49ddb97f2e886440061
+// Typelizer digest a5578d45f5defe3852c905a88af3d772
//
// DO NOT MODIFY: This file was automatically generated by Typelizer.
export type { default as Address } from './Address'
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 455565ef9f..4755e8a0cd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -203,7 +203,7 @@ importers:
version: 6.0.2
vitest:
specifier: ^4.1.2
packages/create-spree-app:
dependencies:
@@ -264,22 +264,22 @@ importers:
version: 25.5.2
'@vitest/coverage-v8':
specifier: ^4.1.2
msw:
specifier: ^2.12.14
- version: 2.12.14(@types/[email protected])([email protected])
+ version: 2.12.14(@types/[email protected])([email protected])
tsup:
specifier: ^8.0.0
tsx:
specifier: ^4.21.0
version: 4.21.0
typescript:
- specifier: ^5.3.0
- version: 5.9.3
+ specifier: ^6.0.2
+ version: 6.0.2
vitest:
- specifier: ^4.0.18
+ specifier: ^4.1.2
zod:
specifier: ^4.3.6
version: 4.3.6
@@ -6753,10 +6753,10 @@ snapshots:
transitivePeerDependencies:
- supports-color
dependencies:
'@bcoe/v8-coverage': 1.0.2
- '@vitest/utils': 4.1.4
+ '@vitest/utils': 4.1.2
ast-v8-to-istanbul: 1.0.0
istanbul-lib-coverage: 3.2.2
istanbul-lib-report: 3.0.1
@@ -6765,9 +6765,9 @@ snapshots:
obug: 2.1.1
std-env: 4.0.0
tinyrainbow: 3.1.0
dependencies:
'@bcoe/v8-coverage': 1.0.2
'@vitest/utils': 4.1.2
@@ -6779,7 +6779,7 @@ snapshots:
obug: 2.1.1
std-env: 4.0.0
tinyrainbow: 3.1.0
'@vitest/[email protected]':
dependencies:
@@ -6799,23 +6799,23 @@ snapshots:
chai: 6.2.2
tinyrainbow: 3.1.0
dependencies:
'@vitest/spy': 4.0.18
estree-walker: 3.0.3
magic-string: 0.30.21
optionalDependencies:
- msw: 2.12.14(@types/[email protected])([email protected])
+ msw: 2.12.14(@types/[email protected])([email protected])
dependencies:
- '@vitest/spy': 4.0.18
+ '@vitest/spy': 4.1.2
estree-walker: 3.0.3
magic-string: 0.30.21
optionalDependencies:
msw: 2.12.14(@types/[email protected])([email protected])
dependencies:
@@ -7855,31 +7855,6 @@ snapshots:
- dependencies:
- '@inquirer/confirm': 5.1.21(@types/[email protected])
- '@mswjs/interceptors': 0.41.2
- '@open-draft/deferred-promise': 2.2.0
- '@types/statuses': 2.0.6
- cookie: 1.1.1
- graphql: 16.13.2
- headers-polyfill: 4.0.3
- is-node-process: 1.2.0
- outvariant: 1.4.3
- path-to-regexp: 6.3.0
- picocolors: 1.1.1
- rettime: 0.10.1
- statuses: 2.0.2
- strict-event-emitter: 0.5.1
- tough-cookie: 6.0.0
- type-fest: 5.4.4
- until-async: 3.0.2
- yargs: 17.7.2
- optionalDependencies:
- typescript: 5.9.3
- transitivePeerDependencies:
- - '@types/node'
-
dependencies:
'@inquirer/confirm': 5.1.21(@types/[email protected])
@@ -8755,34 +8730,6 @@ snapshots:
- dependencies:
- bundle-require: 5.1.0([email protected])
- cac: 6.7.14
- chokidar: 4.0.3
- consola: 3.4.2
- debug: 4.4.3
- esbuild: 0.27.7
- fix-dts-default-cjs-exports: 1.0.1
- joycon: 3.1.1
- picocolors: 1.1.1
- resolve-from: 5.0.0
- rollup: 4.57.1
- source-map: 0.7.6
- sucrase: 3.35.1
- tinyexec: 0.3.2
- tinyglobby: 0.2.15
- tree-kill: 1.2.2
- optionalDependencies:
- postcss: 8.5.8
- typescript: 5.9.3
- transitivePeerDependencies:
- - jiti
- - supports-color
- - tsx
- - yaml
-
dependencies:
bundle-require: 5.1.0([email protected])
@@ -8931,6 +8878,22 @@ snapshots:
tsx: 4.21.0
yaml: 2.8.2
+ dependencies:
+ '@oxc-project/runtime': 0.115.0
+ lightningcss: 1.32.0
+ picomatch: 4.0.4
+ postcss: 8.5.8
+ rolldown: 1.0.0-rc.8
+ tinyglobby: 0.2.15
+ optionalDependencies:
+ '@types/node': 25.5.0
+ esbuild: 0.27.3
+ fsevents: 2.3.3
+ jiti: 2.6.1
+ tsx: 4.21.0
+ yaml: 2.8.2
+
dependencies:
'@oxc-project/runtime': 0.115.0
@@ -8947,10 +8910,10 @@ snapshots:
tsx: 4.21.0
yaml: 2.8.2
dependencies:
'@vitest/expect': 4.0.18
'@vitest/pretty-format': 4.0.18
'@vitest/runner': 4.0.18
'@vitest/snapshot': 4.0.18
@@ -8970,8 +8933,7 @@ snapshots:
why-is-node-running: 2.3.0
optionalDependencies:
- '@types/node': 25.5.2
- '@vitest/coverage-v8': 4.1.4([email protected])
+ '@types/node': 25.5.0
transitivePeerDependencies:
- jiti
- less
@@ -8985,42 +8947,32 @@ snapshots:
- tsx
- yaml
dependencies:
- '@vitest/expect': 4.0.18
- '@vitest/pretty-format': 4.0.18
- '@vitest/runner': 4.0.18
- '@vitest/snapshot': 4.0.18
- '@vitest/spy': 4.0.18
- '@vitest/utils': 4.0.18
- es-module-lexer: 1.7.0
+ '@vitest/expect': 4.1.2
+ '@vitest/pretty-format': 4.1.2
+ '@vitest/runner': 4.1.2
+ '@vitest/snapshot': 4.1.2
+ '@vitest/spy': 4.1.2
+ '@vitest/utils': 4.1.2
+ es-module-lexer: 2.0.0
expect-type: 1.3.0
magic-string: 0.30.21
obug: 2.1.1
pathe: 2.0.3
picomatch: 4.0.4
- std-env: 3.10.0
+ std-env: 4.0.0
tinybench: 2.9.0
tinyexec: 1.0.4
tinyglobby: 0.2.15
tinyrainbow: 3.1.0
why-is-node-running: 2.3.0
optionalDependencies:
'@types/node': 25.5.0
transitivePeerDependencies:
- - jiti
- - less
- - lightningcss
- msw
- - sass
- - sass-embedded
- - stylus
- - sugarss
- - terser
- - tsx
- - yaml
dependencies:
diff --git a/spree/core/app/models/concerns/spree/product_scopes.rb b/spree/core/app/models/concerns/spree/product_scopes.rb
index 9df7247f44..b0e930aff7 100644
--- a/spree/core/app/models/concerns/spree/product_scopes.rb
+++ b/spree/core/app/models/concerns/spree/product_scopes.rb
@@ -147,8 +147,32 @@ module Spree
where("#{Classification.table_name}.taxon_id" => taxon.cached_self_and_descendants_ids).distinct
}
- # Alias for in_taxon — public API name
- scope :in_category, ->(category) { in_taxon(category) }
+ # Products in a category AND all its descendants.
+ # Accepts a Category record or a prefixed ID string (e.g. 'ctg_xxx').
+ def self.in_category(category_or_id)
+ category = category_or_id.is_a?(String) ? Spree::Taxon.find_by_prefix_id(category_or_id) : category_or_id
+ return none unless category
+
+ in_taxon(category)
+ end
+
+ # Products in ANY of the given categories (OR logic), each including descendants.
+ # Accepts an array of Category records, prefixed ID strings, or a mix.
+ def self.in_categories(*categories_or_ids)
+ categories_or_ids = categories_or_ids.flatten.compact
+ return none if categories_or_ids.empty?
+
+ ids, records = categories_or_ids.partition { |c| c.is_a?(String) }
+ if ids.any?
+ decoded = ids.filter_map { |id| Spree::Taxon.decode_prefixed_id(id) }
+ records += Spree::Taxon.where(id: decoded).to_a if decoded.any?
+ end
+ return none if records.empty?
+
+ taxon_ids = records.flat_map(&:cached_self_and_descendants_ids).uniq
+
+ joins(:classifications).where(Classification.table_name => { taxon_id: taxon_ids }).distinct
+ end
# Deprecated — remove in 6.0. Use in_taxon instead.
def self.in_taxons(*taxons)
@@ -214,8 +238,17 @@ module Spree
grouped = OptionValue.where(id: actual_ids).group_by(&:option_type_id)
return none if grouped.empty?
- joins(variants: :option_values).where(Spree::OptionValue.table_name => { id: actual_ids })
- }
+ scope = all
+ grouped.each_value do |option_values|
+ ov_ids = option_values.map(&:id)
+ matching_product_ids = Variant.where(deleted_at: nil)
+ .joins(:option_value_variants)
+ .where(OptionValueVariant.table_name => { option_value_id: ov_ids })
+ .select(:product_id)
+ scope = scope.where(id: matching_product_ids)
+ end
+ scope
+ end
# Deprecated — remove in 6.0. Not used internally.
def self.with(value)