Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
renovate
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SmartDataLab
public
applications
renovate
Commits
d37a3723
Unverified
Commit
d37a3723
authored
2 years ago
by
Sergei Zharinov
Committed by
GitHub
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
fix(packagist): Support both objects and minified arrays in v2 (#20720)
parent
5249759b
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
lib/modules/datasource/packagist/schema.spec.ts
+8
-0
8 additions, 0 deletions
lib/modules/datasource/packagist/schema.spec.ts
lib/modules/datasource/packagist/schema.ts
+26
-14
26 additions, 14 deletions
lib/modules/datasource/packagist/schema.ts
with
34 additions
and
14 deletions
lib/modules/datasource/packagist/schema.spec.ts
+
8
−
0
View file @
d37a3723
...
@@ -141,6 +141,14 @@ describe('modules/datasource/packagist/schema', () => {
...
@@ -141,6 +141,14 @@ describe('modules/datasource/packagist/schema', () => {
},
},
})
})
).
toEqual
([{
version
:
'
1.2.3
'
}]);
).
toEqual
([{
version
:
'
1.2.3
'
}]);
expect
(
parsePackagesResponse
(
'
foo/bar
'
,
{
packages
:
{
'
foo/bar
'
:
{
'
1.2.3
'
:
{
version
:
'
1.2.3
'
}
},
'
baz/qux
'
:
{
'
4.5.6
'
:
{
version
:
'
4.5.6
'
}
},
},
})
).
toEqual
([{
version
:
'
1.2.3
'
}]);
});
});
it
(
'
expands minified fields
'
,
()
=>
{
it
(
'
expands minified fields
'
,
()
=>
{
...
...
This diff is collapsed.
Click to expand it.
lib/modules/datasource/packagist/schema.ts
+
26
−
14
View file @
d37a3723
import
is
from
'
@sindresorhus/is
'
;
import
is
from
'
@sindresorhus/is
'
;
import
{
z
}
from
'
zod
'
;
import
{
z
}
from
'
zod
'
;
import
{
logger
}
from
'
../../../logger
'
;
import
{
logger
}
from
'
../../../logger
'
;
import
{
looseObject
,
looseRecord
,
looseValue
}
from
'
../../../util/schema
'
;
import
{
looseArray
,
looseObject
,
looseRecord
,
looseValue
,
}
from
'
../../../util/schema
'
;
import
type
{
Release
,
ReleaseResult
}
from
'
../types
'
;
import
type
{
Release
,
ReleaseResult
}
from
'
../types
'
;
export
const
MinifiedArray
=
z
.
array
(
z
.
record
(
z
.
unknown
())).
transform
((
xs
)
=>
{
export
const
MinifiedArray
=
z
.
array
(
z
.
record
(
z
.
unknown
())).
transform
((
xs
)
=>
{
...
@@ -54,30 +59,37 @@ export const ComposerRelease = z
...
@@ -54,30 +59,37 @@ export const ComposerRelease = z
);
);
export
type
ComposerRelease
=
z
.
infer
<
typeof
ComposerRelease
>
;
export
type
ComposerRelease
=
z
.
infer
<
typeof
ComposerRelease
>
;
const
ComposerReleasesLooseArray
=
looseArray
(
ComposerRelease
);
type
ComposerReleasesLooseArray
=
z
.
infer
<
typeof
ComposerReleasesLooseArray
>
;
export
const
ComposerReleases
=
z
export
const
ComposerReleases
=
z
.
union
([
.
union
([
z
MinifiedArray
.
transform
((
xs
)
=>
ComposerReleasesLooseArray
.
parse
(
xs
)),
.
record
(
looseValue
(
ComposerRelease
))
looseRecord
(
ComposerRelease
).
transform
((
map
)
=>
Object
.
values
(
map
)),
.
transform
((
map
)
=>
Object
.
values
(
map
)),
z
.
array
(
looseValue
(
ComposerRelease
)),
])
])
.
catch
([])
.
catch
([]);
.
transform
((
xs
)
=>
xs
.
filter
((
x
):
x
is
ComposerRelease
=>
x
!==
null
));
export
type
ComposerReleases
=
z
.
infer
<
typeof
ComposerReleases
>
;
export
type
ComposerReleases
=
z
.
infer
<
typeof
ComposerReleases
>
;
export
const
ComposerPackagesResponse
=
z
.
object
({
export
const
ComposerPackagesResponse
=
z
.
object
({
packageName
:
z
.
string
(),
packagesResponse
:
z
.
object
({
packages
:
z
.
record
(
z
.
unknown
()),
packages
:
z
.
record
(
z
.
unknown
()),
});
}),
})
.
transform
(
({
packageName
,
packagesResponse
})
=>
packagesResponse
.
packages
[
packageName
]
)
.
transform
((
xs
)
=>
ComposerReleases
.
parse
(
xs
));
export
type
ComposerPackagesResponse
=
z
.
infer
<
typeof
ComposerPackagesResponse
>
;
export
function
parsePackagesResponse
(
export
function
parsePackagesResponse
(
packageName
:
string
,
packageName
:
string
,
packagesResponse
:
unknown
packagesResponse
:
unknown
):
ComposerReleases
{
):
ComposerReleases
{
try
{
try
{
const
{
packages
}
=
ComposerPackagesResponse
.
parse
(
packagesResponse
);
return
ComposerPackagesResponse
.
parse
({
packageName
,
packagesResponse
});
const
array
=
MinifiedArray
.
parse
(
packages
[
packageName
]);
const
releases
=
ComposerReleases
.
parse
(
array
);
return
releases
;
}
catch
(
err
)
{
}
catch
(
err
)
{
logger
.
debug
(
logger
.
debug
(
{
packageName
,
err
},
{
packageName
,
err
},
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment