From 4f51e0a47f273e6672b3bac60394f2fc2060f779 Mon Sep 17 00:00:00 2001 From: Jared Ramon Elizan Date: Fri, 14 Oct 2022 15:15:02 +0800 Subject: [PATCH 1/8] README.md (#181) fixed typo --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 515278a..8876b8a 100644 --- a/README.md +++ b/README.md @@ -83,8 +83,8 @@ back-compatibility, it is just removed from all public docs and samples). - `'keep_leading_trailing_space'` -> `'no_trim'` - Changed how we handle custom functions: previously we always use strings as in param type as well as result param type. Not anymore, all types are supported for custom function in and out params. - - Changed the way how we package custom functions for extensions: previously we collect custom functions from all - extensions and then pass all of them to the extension that is used; This feels weird, now changed to only the custom + - Changed the way we package custom functions for extensions: previously we collected custom functions from all + extensions and then passed all of them to the extension that is used; this feels weird, now only the custom functions included in a particular extension are used in that extension. - Deprecated/removed most of the custom functions in favor of using 'javascript'. - A number of package renaming. From 0637d60e9fd70d17c8a7f54703930c09ad69f543 Mon Sep 17 00:00:00 2001 From: JF Technology <57098161+jf-tech@users.noreply.github.com> Date: Wed, 7 Dec 2022 08:55:52 +1300 Subject: [PATCH 2/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8876b8a..eee9f8d 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ In the example folders above you will find pairs of input files and their schema ## Online Playground -Use https://omniparser.herokuapp.com/ (may need to wait for a few seconds for heroku instance to wake up) +Use [The Playground](https://omniparser-prod-omniparser-qd0sj4.mo2.mogenius.io/) (may need to wait for a few seconds for instance to wake up) for trying out schemas and inputs, yours or existing samples, to see how ingestion and transform work. ![](./cli/cmd/web/playground-demo.gif) From a3adf70e2491255cd3ee862dc8420de7307bd11d Mon Sep 17 00:00:00 2001 From: JF Technology <57098161+jf-tech@users.noreply.github.com> Date: Sun, 8 Jan 2023 09:34:29 +1300 Subject: [PATCH 3/8] comp license and sponosor page (#186) --- sponsors/COMPANY_LICENSE.md | 23 +++++++++++++++++++++++ sponsors/SPONSORS.md | 6 ++++++ 2 files changed, 29 insertions(+) create mode 100644 sponsors/COMPANY_LICENSE.md create mode 100644 sponsors/SPONSORS.md diff --git a/sponsors/COMPANY_LICENSE.md b/sponsors/COMPANY_LICENSE.md new file mode 100644 index 0000000..eddbf0c --- /dev/null +++ b/sponsors/COMPANY_LICENSE.md @@ -0,0 +1,23 @@ +# Company License + +Copyright (c) 2023 - present [JF Technology](https://github.com/jf-tech) + +## Licensing Information + +In addition to the terms and conditions mentioned in the [main license](../LICENSE), your +company is entitled to the following when sponsorship is active: + +| Item | - | +| ---------------------------------- | --- | +| Team Size | **Unlimited** | +| Number of Apps/Services Using This Code | **Unlimited** | +| Feature Updates and Bug Fixes: | **Yes** | +| Prioritized Feature Request Discussion and Response | **Yes** | +| Prioritized [Support](mailto:jf.tech.llc@gmail.com) or [Issues](https://github.com/jf-tech/omniparser/issues) Response | **Yes** | +| Included in [Sponsors Page](./SPONSORS.md) | **Yes** | +| --- | --- | +| Remove copyright mentions/license from source code | NO | +| Production deployment and troubleshooting assistance | NO | + +--- +For more information regarding licensing, please contact [support](mailto:jf.tech.llc@gmail.com). diff --git a/sponsors/SPONSORS.md b/sponsors/SPONSORS.md new file mode 100644 index 0000000..fcaf505 --- /dev/null +++ b/sponsors/SPONSORS.md @@ -0,0 +1,6 @@ +# Sponsors & Backers + +> Omniparser is an MIT-licensed open source project with its ongoing development made possible entirely by the support of the awesome sponsors and backers listed in this file. If you'd like to join them, please consider [ sponsor its development](https://github.com/sponsors/jf-tech). + +### Corporate Sponsors +### Generous Individual Backers From 862e3989be55cd4342367a7914a2eb14e88ff6c8 Mon Sep 17 00:00:00 2001 From: JF Technology <57098161+jf-tech@users.noreply.github.com> Date: Sun, 8 Jan 2023 09:51:25 +1300 Subject: [PATCH 4/8] spon/comp/main upate (#187) --- README.md | 9 +++++++-- sponsors/COMPANY_LICENSE.md | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index eee9f8d..e5e3333 100644 --- a/README.md +++ b/README.md @@ -9,10 +9,15 @@ Omniparser is a native Golang ETL parser that ingests input data of various form XML, EDI/X12/EDIFACT, JSON**, and custom formats) in streaming fashion and transforms data into desired JSON output based on a schema written in JSON. -**Please kindly consider sponsoring the project to fund future development and issue resolutions**: https://github.com/sponsors/jf-tech - Min Golang Version: 1.14 +## Licenses and Sponsorship +Omniparser is publicly available under [MIT License](./LICENSE). +[Individual and corporate sponsorships](https://github.com/sponsors/jf-tech/) are welcome and gratefully +appreciated, and will be listed in the [SPONSORS](./sponsors/SPONSORS.md) page. +[Company-level sponsors](https://github.com/sponsors/jf-tech/) get additional benefits and supports +granted in the [COMPANY LICENSE](./sponsors/COMPANY_LICENSE.md). + ## Documentation Docs: diff --git a/sponsors/COMPANY_LICENSE.md b/sponsors/COMPANY_LICENSE.md index eddbf0c..430b4d5 100644 --- a/sponsors/COMPANY_LICENSE.md +++ b/sponsors/COMPANY_LICENSE.md @@ -5,7 +5,7 @@ Copyright (c) 2023 - present [JF Technology](https://github.com/jf-tech) ## Licensing Information In addition to the terms and conditions mentioned in the [main license](../LICENSE), your -company is entitled to the following when sponsorship is active: +company is entitled to the following when company level sponsorship is active: | Item | - | | ---------------------------------- | --- | From 6fa373cc94bb718c4a33bb46551db0ec4cbce4cb Mon Sep 17 00:00:00 2001 From: JF Technology <57098161+jf-tech@users.noreply.github.com> Date: Tue, 14 Mar 2023 09:49:03 +1300 Subject: [PATCH 5/8] Update README.md playground suspension. --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e5e3333..935c4ab 100644 --- a/README.md +++ b/README.md @@ -51,12 +51,12 @@ Examples: In the example folders above you will find pairs of input files and their schema files. Then in the `.snapshots` sub directory, you'll find their corresponding output files. -## Online Playground +## Online Playground (not functioning) -Use [The Playground](https://omniparser-prod-omniparser-qd0sj4.mo2.mogenius.io/) (may need to wait for a few seconds for instance to wake up) -for trying out schemas and inputs, yours or existing samples, to see how ingestion and transform work. +~~Use [The Playground](https://omniparser-prod-omniparser-qd0sj4.mo2.mogenius.io/) (may need to wait for a few seconds for instance to wake up) +for trying out schemas and inputs, yours or existing samples, to see how ingestion and transform work.~~ -![](./cli/cmd/web/playground-demo.gif) +As for now (2023/03/14), all of our previous free docker hosting solutions went away and we haven't found another one yet. For now please clone the repo and use `./cli.sh` as described in the [Getting Started](./doc/gettingstarted.md) page. ## Why - No good ETL transform/parser library exists in Golang. From b4d60adc5e953c685e29720db2c2231c87a6ec26 Mon Sep 17 00:00:00 2001 From: JF Technology <57098161+jf-tech@users.noreply.github.com> Date: Thu, 6 Apr 2023 11:11:22 +1200 Subject: [PATCH 6/8] entos llc (#198) --- sponsors/SPONSORS.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sponsors/SPONSORS.md b/sponsors/SPONSORS.md index fcaf505..fa4b1fe 100644 --- a/sponsors/SPONSORS.md +++ b/sponsors/SPONSORS.md @@ -3,4 +3,7 @@ > Omniparser is an MIT-licensed open source project with its ongoing development made possible entirely by the support of the awesome sponsors and backers listed in this file. If you'd like to join them, please consider [ sponsor its development](https://github.com/sponsors/jf-tech). ### Corporate Sponsors + +- Entos LLC + ### Generous Individual Backers From 1604d8f60fdf57f0b3cd1f6d5e63070b82472550 Mon Sep 17 00:00:00 2001 From: jose-sherpa <70554515+jose-sherpa@users.noreply.github.com> Date: Thu, 29 Jun 2023 17:56:06 -0400 Subject: [PATCH 7/8] allowing for extra properties in edi file declaration (#207) Adding `_comment` property to EDI schema to annotate segments and/or elements. --- .../omniv21/samples/edi/1_canadapost_edi_214.schema.json | 3 ++- extensions/omniv21/samples/edi/2_ups_edi_210.schema.json | 3 ++- extensions/omniv21/validation/ediFileDeclaration.go | 9 ++++++--- extensions/omniv21/validation/ediFileDeclaration.json | 9 ++++++--- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/extensions/omniv21/samples/edi/1_canadapost_edi_214.schema.json b/extensions/omniv21/samples/edi/1_canadapost_edi_214.schema.json index 820f457..7f4b592 100644 --- a/extensions/omniv21/samples/edi/1_canadapost_edi_214.schema.json +++ b/extensions/omniv21/samples/edi/1_canadapost_edi_214.schema.json @@ -12,6 +12,7 @@ "child_segments": [ { "name": "GS", + "_comment": "functional group", "child_segments": [ { "name": "scanInfo", "type": "segment_group", "min": 0, "max": -1, "is_target": true, @@ -26,7 +27,7 @@ { "name": "N4", "elements": [ - { "name": "cityName", "index": 1 }, + { "name": "cityName", "index": 1, "_comment": "E19" }, { "name": "provinceCode", "index": 2 }, { "name": "postalCode", "index": 3 }, { "name": "countryCode", "index": 4 } diff --git a/extensions/omniv21/samples/edi/2_ups_edi_210.schema.json b/extensions/omniv21/samples/edi/2_ups_edi_210.schema.json index 11e8c7d..e6ce9b3 100644 --- a/extensions/omniv21/samples/edi/2_ups_edi_210.schema.json +++ b/extensions/omniv21/samples/edi/2_ups_edi_210.schema.json @@ -14,6 +14,7 @@ "child_segments": [ { "name": "GS", + "_comment": "functional group", "child_segments": [ { "name": "invoiceInfo", "type": "segment_group", "min": 0, "max": -1, "is_target": true, @@ -74,7 +75,7 @@ "elements": [ { "name": "refIdQualifier_N901", "index": 1 }, { "name": "refId_N902", "index": 2, "default": "" }, - { "name": "date", "index": 4, "default": "" }, + { "name": "date", "index": 4, "default": "", "_comment": "YYYYMMDD"}, { "name": "product_code_C04004", "index": 7, "component_index": 4, "default": "" } ] }, diff --git a/extensions/omniv21/validation/ediFileDeclaration.go b/extensions/omniv21/validation/ediFileDeclaration.go index bf65a8c..c93f8f3 100644 --- a/extensions/omniv21/validation/ediFileDeclaration.go +++ b/extensions/omniv21/validation/ediFileDeclaration.go @@ -49,7 +49,8 @@ const ( "index": { "type": "integer", "minimum": 1 }, "component_index": { "type": "integer", "minimum": 1 }, "empty_if_missing": { "type": "boolean","$comment": "deprecated, use 'default'" }, - "default": { "type": "string" } + "default": { "type": "string" }, + "_comment": { "$ref": "#/definitions/value_comment" } }, "required": [ "name", "index" ], "additionalProperties": false @@ -60,11 +61,13 @@ const ( "items": { "$ref": "#/definitions/segment_declaration_type" } - } + }, + "_comment": { "$ref": "#/definitions/value_comment" } }, "required": [ "name" ], "additionalProperties": false - } + }, + "value_comment": { "type": "string" } } } ` diff --git a/extensions/omniv21/validation/ediFileDeclaration.json b/extensions/omniv21/validation/ediFileDeclaration.json index e5d4db4..2a30335 100644 --- a/extensions/omniv21/validation/ediFileDeclaration.json +++ b/extensions/omniv21/validation/ediFileDeclaration.json @@ -42,7 +42,8 @@ "index": { "type": "integer", "minimum": 1 }, "component_index": { "type": "integer", "minimum": 1 }, "empty_if_missing": { "type": "boolean","$comment": "deprecated, use 'default'" }, - "default": { "type": "string" } + "default": { "type": "string" }, + "_comment": { "$ref": "#/definitions/value_comment" } }, "required": [ "name", "index" ], "additionalProperties": false @@ -53,10 +54,12 @@ "items": { "$ref": "#/definitions/segment_declaration_type" } - } + }, + "_comment": { "$ref": "#/definitions/value_comment" } }, "required": [ "name" ], "additionalProperties": false - } + }, + "value_comment": { "type": "string" } } } \ No newline at end of file From 37370faf3f4c3fb6f37a64c34ecd559248aa2ef2 Mon Sep 17 00:00:00 2001 From: JF Technology <57098161+jf-tech@users.noreply.github.com> Date: Wed, 19 Jul 2023 12:07:04 +1200 Subject: [PATCH 8/8] sponsor: healthsherpa (#211) --- .gitignore | 3 +++ sponsors/SPONSORS.md | 2 ++ sponsors/resources/HealthSherpa.png | Bin 0 -> 923 bytes sponsors/resources/template.jpg | Bin 0 -> 24826 bytes 4 files changed, 5 insertions(+) create mode 100644 sponsors/resources/HealthSherpa.png create mode 100644 sponsors/resources/template.jpg diff --git a/.gitignore b/.gitignore index bc42122..235b508 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,6 @@ op # Coverage coverage.txt + +# Misc +.DS_Store diff --git a/sponsors/SPONSORS.md b/sponsors/SPONSORS.md index fa4b1fe..caf74cb 100644 --- a/sponsors/SPONSORS.md +++ b/sponsors/SPONSORS.md @@ -6,4 +6,6 @@ - Entos LLC +- ![HealthSherpa](resources/HealthSherpa.png) + ### Generous Individual Backers diff --git a/sponsors/resources/HealthSherpa.png b/sponsors/resources/HealthSherpa.png new file mode 100644 index 0000000000000000000000000000000000000000..f172f11ea3561184e74b4b69d2976b09159d18fe GIT binary patch literal 923 zcmV;M17!S(P)AUv;Z7;TX&>FWtuu(mDT6- zi@M!us@A8><^U~y!OGhyj>_Tg_M64y0Cc~Em$^@!&|sw0&*ZZ`0008UNklnc zc6xK0DfNB0#J+&5n{u%lyEL`-C~XUwxOq9uOVP@}5<9N!6a0ot4*=>0T^5~N=A-Bj zNi#!4-#6XCo?T|1+1-Bcsg%FzPREU__zX~!V(Y#+@lz7mWZ1B~{e74(_bZlpR}aFL z4jm=z;Jlkh){d=XsUZ~3M7>k1SrYK&Yrq^nZ;(sgR` zGLM3rd)N9mYS&T|T%XMIwaoUJg~Eh=)cKRF7>2@cj>9m|#_8}O zDf%ii_%Qc(t{a99>$F40nZmy}l(YZl%-)S>Q~JlcAKKh(&e8zy?>Fqf3`Ji(wh`X% x-gmbCeT>cPpNrew<43Vj)gP3|ulR~h{06E#Hjo%}&}{$!002ovPDHLkV1g{;$F=|f literal 0 HcmV?d00001 diff --git a/sponsors/resources/template.jpg b/sponsors/resources/template.jpg new file mode 100644 index 0000000000000000000000000000000000000000..a59e6a1e5c5a4b017460fbc1d09bf2fc3fb2eaed GIT binary patch literal 24826 zcmeI(OHRWu5XSMDIBwFsu!~c=t;DhiU>BrHmCBtEoPlF-48$RLYsPqAcrX=IX{b zW$EV5Uxv1AtBb3}JS=9R4Z}~=#51X#T00GOS%-gD{~|t5Z?Z?DUJ|dyYyT>3ysGS1 z9=F4vUFkohGAfBPPDGz?_Yd)f00IagfB*srAb