Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Convert JSON schema to malli #915

Draft
wants to merge 90 commits into
base: master
Choose a base branch
from
Draft

Convert JSON schema to malli #915

wants to merge 90 commits into from

Commits on Jan 6, 2021

  1. Initial implementation of json-schema import 

    This allows a very basic json-schema->malli conversion and will most likely need to be adequated to:
   - cleanup TODOS;
   - ensure function names are sane;
   - ensure all json-schema features are supported (at least for one specific version, i.e. draft-7).
    @hkupty
    hkupty committed Jan 6, 2021
    Configuration menu
    Copy the full SHA
    e099544 View commit details
    Browse the repository at this point in the history

  2. Simplify functions, rename and make code simpler 

    Also, remove duplication.
    @hkupty
    hkupty committed Jan 6, 2021
    Configuration menu
    Copy the full SHA
    74f62cf View commit details
    Browse the repository at this point in the history

  3. Add support for anyOf and allOf

    @hkupty
    hkupty committed Jan 6, 2021
    Configuration menu
    Copy the full SHA
    9690651 View commit details
    Browse the repository at this point in the history

  4. Rename import->parse 

    Also, reorganize functions to simplify processing, reduce duplication and avoid special casing.

Lastly, make schema->malli the first entry point since anything can be a schema. It then delegates to types, aggregates or `$ref`s.
    @hkupty
    hkupty committed Jan 6, 2021
    Configuration menu
    Copy the full SHA
    b3f6a9a View commit details
    Browse the repository at this point in the history

  5. Implement properties for strings, some int checks 

    Also, adds top-level enums (and consts) and prepares for better range checks in int/number.
    @hkupty
    hkupty committed Jan 6, 2021
    Configuration menu
    Copy the full SHA
    0ad4ca5 View commit details
    Browse the repository at this point in the history

  6. Fix missing :else clause

    @hkupty
    hkupty committed Jan 6, 2021
    Configuration menu
    Copy the full SHA
    404e664 View commit details
    Browse the repository at this point in the history

  7. Add annotations as malli properties

    @hkupty
    hkupty committed Jan 6, 2021
    Configuration menu
    Copy the full SHA
    fc5059b View commit details
    Browse the repository at this point in the history

  8. Add min/max properties

    @hkupty
    hkupty committed Jan 6, 2021
    Configuration menu
    Copy the full SHA
    18332a6 View commit details
    Browse the repository at this point in the history

  9. add min/max properties to object

    @hkupty
    hkupty committed Jan 6, 2021
    Configuration menu
    Copy the full SHA
    9f380a7 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2023

  1. Merge branch 'master' of github.com:metosin/malli into js-schema-to-m… 

    …alli
    @PavlosMelissinos
    PavlosMelissinos committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    1d7a210 View commit details
    Browse the repository at this point in the history

  2. Support uuid-formatted strings

    @PavlosMelissinos
    PavlosMelissinos committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    d7a9f1f View commit details
    Browse the repository at this point in the history

  3. Support {..., "type": ["integer","string"], ...} syntax

    @PavlosMelissinos
    PavlosMelissinos committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    cf67b24 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2023

  1. Fix const

    @PavlosMelissinos
    PavlosMelissinos committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    d4d32a5 View commit details
    Browse the repository at this point in the history

  2. Add test for parser

    @PavlosMelissinos
    PavlosMelissinos committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    33fd1b6 View commit details
    Browse the repository at this point in the history

  3. Fix numbers

    @PavlosMelissinos
    PavlosMelissinos committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    90b0f39 View commit details
    Browse the repository at this point in the history

  4. Tweak string parsing (omit :min/:max when {min,max}Length is missing)

    @PavlosMelissinos
    PavlosMelissinos committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    a08acfc View commit details
    Browse the repository at this point in the history

  5. Prefer :nil over nil?

    @PavlosMelissinos
    PavlosMelissinos committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    5d2ac57 View commit details
    Browse the repository at this point in the history

  6. Remove ambiguous test cases

    @PavlosMelissinos
    PavlosMelissinos committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    69722c8 View commit details
    Browse the repository at this point in the history

  7. Fix string enums

    @PavlosMelissinos
    PavlosMelissinos committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    7e25ef0 View commit details
    Browse the repository at this point in the history

  8. Remove ambiguous/invalid test cases

    @PavlosMelissinos
    PavlosMelissinos committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    f54739a View commit details
    Browse the repository at this point in the history

  9. Fix case of empty json schema

    @PavlosMelissinos
    PavlosMelissinos committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    61b174e View commit details
    Browse the repository at this point in the history

  10. Remove ambiguous test case

    @PavlosMelissinos
    PavlosMelissinos committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    0bc83f0 View commit details
    Browse the repository at this point in the history

  11. Fix set parsing

    @PavlosMelissinos
    PavlosMelissinos committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    1fbf35a View commit details
    Browse the repository at this point in the history

  12. Fix additionalProperties in objects

    @PavlosMelissinos
    PavlosMelissinos committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    22572dc View commit details
    Browse the repository at this point in the history

  13. Fix typo

    @PavlosMelissinos
    PavlosMelissinos committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    b849ddb View commit details
    Browse the repository at this point in the history

  14. Prefer string keyword

    @PavlosMelissinos
    PavlosMelissinos committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    2abfde4 View commit details
    Browse the repository at this point in the history

  15. Prefer keywords

    @PavlosMelissinos
    PavlosMelissinos committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    a4ebd9d View commit details
    Browse the repository at this point in the history

  16. Add support for more types - custom (when single attribute) and file

    @PavlosMelissinos
    PavlosMelissinos committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    18a49e6 View commit details
    Browse the repository at this point in the history

  17. Add tests for schema properties and improve test case diffs

    @PavlosMelissinos
    PavlosMelissinos committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    66a5e94 View commit details
    Browse the repository at this point in the history

  18. Support annotations

    @PavlosMelissinos
    PavlosMelissinos committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    c40e18b View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2023

  1. Specify one-way expectations (mutating conversions)

    @PavlosMelissinos
    PavlosMelissinos committed Mar 5, 2023
    Configuration menu
    Copy the full SHA
    169d9ea View commit details
    Browse the repository at this point in the history

  2. Tweak

    @PavlosMelissinos
    PavlosMelissinos committed Mar 5, 2023
    Configuration menu
    Copy the full SHA
    81fd361 View commit details
    Browse the repository at this point in the history

  3. Fix indentation

    @PavlosMelissinos
    PavlosMelissinos committed Mar 5, 2023
    Configuration menu
    Copy the full SHA
    dcf63bd View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2023

  1. Merge branch 'master' of github.com:metosin/malli into js-schema-to-m… 

    …alli
    @PavlosMelissinos
    PavlosMelissinos committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    7160138 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2023

  1. Merge branch 'master' of github.com:metosin/malli into js-schema-to-m… 

    …alli
    @PavlosMelissinos
    PavlosMelissinos committed Mar 12, 2023
    Configuration menu
    Copy the full SHA
    050b93e View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2023

  1. BREAKING: -simple-schema :compile

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    f9ad572 View commit details
    Browse the repository at this point in the history

  2. BREAKING: -collection-schema :compile

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    8e6e4ed View commit details
    Browse the repository at this point in the history

  3. add missing type-hint for :schema

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    6f5014f View commit details
    Browse the repository at this point in the history

  4. allow old style with DEPRECATED message

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    3a8341b View commit details
    Browse the repository at this point in the history

  5. format

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    6c62326 View commit details
    Browse the repository at this point in the history

  6. README

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    f303d3d View commit details
    Browse the repository at this point in the history

  7. Fix inconsistencies on UUID transform helper 

    Now it works correctly and with same behavior on cljs
and clj.
    @niwinz @PavlosMelissinos
    niwinz authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    7e823e1 View commit details
    Browse the repository at this point in the history

  8. Add helper script for start a REPL with rebel-readline 

    Makes running individual tests easily with the help of
tools.namespace for namespace reloading.
    @niwinz @PavlosMelissinos
    niwinz authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    d2e14f1 View commit details
    Browse the repository at this point in the history

  9. cleanup / deloc

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    fb0a174 View commit details
    Browse the repository at this point in the history

  10. validator & explain

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    f72e692 View commit details
    Browse the repository at this point in the history

  11. transform + test, WIP

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    a782abe View commit details
    Browse the repository at this point in the history

  12. fix tests

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    47bca75 View commit details
    Browse the repository at this point in the history

  13. parsers & unparsers

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    d42044f View commit details
    Browse the repository at this point in the history

  14. reorg tests

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    8815f36 View commit details
    Browse the repository at this point in the history

  15. parser & unparser

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    e259a3b View commit details
    Browse the repository at this point in the history

  16. json-schema + m/explicit-keys

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    56c250b View commit details
    Browse the repository at this point in the history

  17. .

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    29592cd View commit details
    Browse the repository at this point in the history

  18. fix gens

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    a199fb4 View commit details
    Browse the repository at this point in the history

  19. m/default-schema

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    597c293 View commit details
    Browse the repository at this point in the history

  20. deep merge like a boss

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    70a23d2 View commit details
    Browse the repository at this point in the history

  21. deeply recursive test

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    57784bc View commit details
    Browse the repository at this point in the history

  22. fix ::m/default generation on maps

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    205658a View commit details
    Browse the repository at this point in the history

  23. fix generators

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    d33258d View commit details
    Browse the repository at this point in the history

  24. format

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    ef08a73 View commit details
    Browse the repository at this point in the history

  25. strip-extra-keys

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    d72099c View commit details
    Browse the repository at this point in the history

  26. docs

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    880db0e View commit details
    Browse the repository at this point in the history

  27. cleanup

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    af91665 View commit details
    Browse the repository at this point in the history

  28. CHANGELOG

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    6b46a6b View commit details
    Browse the repository at this point in the history

  29. CHANGELOG

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    ac672ac View commit details
    Browse the repository at this point in the history

  30. remove ::m/default wrapping from parsing

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    035f873 View commit details
    Browse the repository at this point in the history

  31. better doc

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    d7822a4 View commit details
    Browse the repository at this point in the history

  32. test: one more test case for ::m/default + strip-extra-keys

    @opqdonut @PavlosMelissinos
    opqdonut authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    65effca View commit details
    Browse the repository at this point in the history

  33. Move swagger gen code from reitit-malli to here 

    This allows us to see the whole spec at once and fix a bug w/ custom registry definitions
    @cap10morgan @PavlosMelissinos
    cap10morgan authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    58f1ed7 View commit details
    Browse the repository at this point in the history

  34. Properly encode the / in qualified keywords as ~1 

    ...in json-schema. Also removes the leading `:` which the definitions keys also didn't have. This allows the refs and definitions keys to match and be standards-compliant.
    @cap10morgan @PavlosMelissinos
    cap10morgan authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    c5968a3 View commit details
    Browse the repository at this point in the history

  35. Don't define circular refs in definitions 

    Perhaps this really needs to be fixed at a lower level, but I noticed that at times I was getting definitions whose values where just refs back to the same definition. These seemed to come in addition to the correct result that had the actual definition in it. So this just filters out the circular ones.
    @cap10morgan @PavlosMelissinos
    cap10morgan authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    98dfbeb View commit details
    Browse the repository at this point in the history

  36. Clean up commented-out code & printlns

    @cap10morgan @PavlosMelissinos
    cap10morgan authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    4732c01 View commit details
    Browse the repository at this point in the history

  37. Prefix remove-empty-keys w/ - & move out of public api

    @cap10morgan @PavlosMelissinos
    cap10morgan authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    ff2c1b7 View commit details
    Browse the repository at this point in the history

  38. Update test expectations for no leading : & ~1

    @cap10morgan @PavlosMelissinos
    cap10morgan authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    ba2fc9c View commit details
    Browse the repository at this point in the history

  39. Fix circular definition prevention comparison

    @cap10morgan @PavlosMelissinos
    cap10morgan authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    0da94b8 View commit details
    Browse the repository at this point in the history

  40. Add a test for circular definitions avoidance 

    ...in json-schema-test/references-test. Fix was in 23488b2.
    @cap10morgan @PavlosMelissinos
    cap10morgan authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    9e14bd2 View commit details
    Browse the repository at this point in the history

  41. Add tests for swagger/swagger-spec 

    ...including one commented-out failing test that should pass once issue metosin#464 is fixed.
    @cap10morgan @PavlosMelissinos
    cap10morgan authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    1ab8cba View commit details
    Browse the repository at this point in the history

  42. Add a swagger-spec test w/o a registry

    @cap10morgan @PavlosMelissinos
    cap10morgan authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    a4a489d View commit details
    Browse the repository at this point in the history

  43. doc: add some citations for ~1 encoding

    @opqdonut @PavlosMelissinos
    opqdonut authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    06495d6 View commit details
    Browse the repository at this point in the history

  44. format

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    db3606f View commit details
    Browse the repository at this point in the history

  45. fix metosin#874

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    40c915a View commit details
    Browse the repository at this point in the history

  46. CHANGELOG

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    42c7244 View commit details
    Browse the repository at this point in the history

  47. 0.10.3

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    2524fd3 View commit details
    Browse the repository at this point in the history

  48. Update deps

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    9fcc8c0 View commit details
    Browse the repository at this point in the history

  49. remove println, fail on reitit

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    576b3ae View commit details
    Browse the repository at this point in the history

  50. format

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    ff23346 View commit details
    Browse the repository at this point in the history

  51. CHANGELOG

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    feb52a9 View commit details
    Browse the repository at this point in the history

  52. 0.10.4

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    be3aba1 View commit details
    Browse the repository at this point in the history

  53. Fix typo 

    Unless I'm missing something, present tense should be used here as it's currently true that you have to bring in your state atom in order to have a global registry
    @simonacca @PavlosMelissinos
    simonacca authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    7d24786 View commit details
    Browse the repository at this point in the history

  54. Update tips.md

    @ikitommi @PavlosMelissinos
    ikitommi authored and PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    d3754ce View commit details
    Browse the repository at this point in the history

  55. Merge branch 'master' of github.com:metosin/malli into js-schema-to-m… 

    …alli
    @PavlosMelissinos
    PavlosMelissinos committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    2bac51d View commit details
    Browse the repository at this point in the history