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.

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

Fix: changed the default behaviour of strictQualifiedDateTimes fix: #845 #935

Closed
wants to merge 85 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
fc35a40
feat(types): build uniontypes too (#765)
mttrbrts Nov 24, 2023
886a91b
fix(class): throw error when class is extending itself (#767)
Nov 28, 2023
c5f5e2e
chore(actions): publish v3.16.0 to npm (#768)
github-actions[bot] Nov 29, 2023
c0c306f
fix(class-declaration): throw with undefined ast properties (#771)
ekarademir Dec 21, 2023
769baa0
fix(error): adding type to error in string validator in introspect (#…
santanu8961 Jan 2, 2024
ced1b3e
chore(actions): publish v3.16.1 to npm (#778)
github-actions[bot] Jan 8, 2024
22df472
chore(deps): bump follow-redirects from 1.15.0 to 1.15.4 in /packages…
dependabot[bot] Jan 26, 2024
feb9a81
chore(deps-dev): bump follow-redirects from 1.15.3 to 1.15.4 in /pack…
dependabot[bot] Jan 26, 2024
dd05218
chore(deps): bump follow-redirects from 1.15.3 to 1.15.4 in /packages…
dependabot[bot] Jan 26, 2024
b1def12
chore(deps): bump axios, @accordproject/concerto-metamodel and @accor…
dependabot[bot] Jan 26, 2024
09eafba
chore(deps): bump concerto-metamodel dependency (#788)
mttrbrts Jan 26, 2024
4589d40
chore(deps): bump axios and @accordproject/concerto-metamodel in /pac…
dependabot[bot] Jan 26, 2024
3e81cf5
chore(deps-dev): bump follow-redirects from 1.15.2 to 1.15.5 (#790)
dependabot[bot] Jan 26, 2024
f0c3228
chore(actions): publish v3.16.2 to npm (#791)
github-actions[bot] Jan 26, 2024
57c47b2
chore(deps-dev): bump axios from 0.23.0 to 1.6.0 in /packages/concert…
dependabot[bot] Jan 26, 2024
429a9a8
chore(actions): publish v3.16.3 to npm (#793)
github-actions[bot] Jan 29, 2024
a406c0f
refactor(declarations): move declaration uniqueness check to model fi…
ekarademir Jan 29, 2024
0d7f108
chore(actions): publish v3.16.4 to npm (#795)
github-actions[bot] Jan 29, 2024
0e363fb
perf(core): don't use arrays to check uniqueness (#802)
ekarademir Feb 6, 2024
e1527cf
perf(core): remove usage of arrays while forming duplicate item error…
ekarademir Feb 6, 2024
4ebc9f5
chore(actions): publish v3.16.5 to npm (#805)
github-actions[bot] Feb 7, 2024
ed6c188
docs(developer): use npx to install lerna (#811)
sanketshevkar Feb 26, 2024
7e2289c
chore(deps-dev): bump ip from 2.0.0 to 2.0.1 (#807)
dependabot[bot] Mar 10, 2024
eb76e5a
chore(deps): bump axios, @accordproject/concerto-codegen and @accordp…
dependabot[bot] Mar 10, 2024
15446c5
chore(deps-dev): bump axios from 0.23.0 to 1.6.0 in /packages/concert…
dependabot[bot] Mar 10, 2024
0fca1e8
chore(deps-dev): bump @babel/traverse from 7.22.5 to 7.24.0 (#817)
dependabot[bot] Mar 10, 2024
e05ea3d
perf(core): avoid unnecessary re-serialisation (#828)
mttrbrts Mar 21, 2024
64efc4c
chore(deps): bump follow-redirects from 1.15.5 to 1.15.6 in /packages…
dependabot[bot] Mar 21, 2024
836d094
chore(deps): bump follow-redirects from 1.15.5 to 1.15.6 in /packages…
dependabot[bot] Mar 21, 2024
671b2b7
chore(deps-dev): bump follow-redirects from 1.15.5 to 1.15.6 (#826)
dependabot[bot] Mar 21, 2024
021709e
chore(deps): bump follow-redirects from 1.15.5 to 1.15.6 in /packages…
dependabot[bot] Mar 21, 2024
610befd
chore(deps-dev): bump follow-redirects from 1.15.5 to 1.15.6 in /pack…
dependabot[bot] Mar 21, 2024
3dddd1e
chore(actions): publish v3.16.6 to npm (#829)
github-actions[bot] Mar 21, 2024
1dad9ba
fix(map): fix semantic validation (#841)
jonathan-casey Apr 18, 2024
4c327bd
chore(actions): publish v3.16.7 to npm (#842)
github-actions[bot] Apr 18, 2024
0b06c17
fix(core): private `accept` methods in introspect classes - I839 (#843)
apoorvsxna May 1, 2024
dfbf14c
chore(deps-dev): bump ejs from 3.1.9 to 3.1.10 (#847)
dependabot[bot] May 1, 2024
81fa0ea
fix(core): missing serializer option in typedef (#846)
mttrbrts May 1, 2024
bfeb53f
Fixed no such file or directory error in decoratormanager.js Test Fil…
subhajit20 May 1, 2024
9c77a32
chore(actions): publish v3.16.8 to npm (#848)
github-actions[bot] May 1, 2024
eda10d5
Ertugrul/update axios to safe ver (#851)
ekarademir May 17, 2024
e6da673
chore(actions): publish v3.16.9 to npm (#852)
github-actions[bot] May 17, 2024
779cb0e
chore(deps-dev): bump braces from 3.0.2 to 3.0.3 (#862)
dependabot[bot] Jun 18, 2024
7501f2f
chore(deps): update concerto-metamodel version (#863)
ekarademir Jun 19, 2024
5b21276
chore(actions): publish v3.16.10 to npm (#864)
github-actions[bot] Jun 19, 2024
8c7120f
fix(core): falsy default values (#866)
mttrbrts Jun 21, 2024
ad762b7
chore(*): Create FUNDING.yml
mttrbrts Jun 25, 2024
9e61044
chore(*): Update FUNDING.yml
mttrbrts Jun 25, 2024
731b2f1
chore(deps): update concerto-metamodel version (#873)
ekarademir Jul 5, 2024
032bd75
feat: alias Import rules added (#855)
salujajaskeerat Jul 8, 2024
e76b23b
chore(actions): publish v3.17.0 to npm (#875)
github-actions[bot] Jul 8, 2024
08eeee5
fix(core): new pathway to apply namespace targeted decorators (#877)
sanketshevkar Jul 11, 2024
913b95d
feat(alias-import): update runtime classes to understand import alias…
salujajaskeerat Jul 11, 2024
8233b39
fix(test): update the change log with correct hash (#878)
ekarademir Jul 11, 2024
c252d82
chore(actions): publish v3.17.1 to npm (#879)
github-actions[bot] Jul 11, 2024
bf3385c
feat(dcs): optimize decorate models (#857)
sanketshevkar Jul 24, 2024
e6e0771
chore(actions): publish v3.18.0 to npm (#885)
github-actions[bot] Jul 24, 2024
ad780d0
feat(decorator): added new methods to extract vocab or non-vocab deco…
DibyamAgrawal Aug 7, 2024
737a516
chore(actions): publish v3.18.1 to npm (#891)
github-actions[bot] Aug 8, 2024
425fc18
feat(aliasing): getImportedType() in model Flle in aliasing (#890)
salujajaskeerat Aug 23, 2024
fea4c91
feat(alias-import): added test case for introspector (#882)
salujajaskeerat Aug 27, 2024
41cd639
chore(actions): publish v3.18.2 to npm (#892)
github-actions[bot] Aug 27, 2024
6247c15
feat(import-alias):patch change for aliased imported types (#894)
salujajaskeerat Aug 30, 2024
040cd1b
chore(deps-dev): bump webpack from 5.76.0 to 5.94.0 in /packages/conc…
dependabot[bot] Aug 30, 2024
2654e15
chore(deps-dev): bump elliptic from 6.5.4 to 6.5.7 in /packages/conce…
dependabot[bot] Aug 30, 2024
7b34b87
chore(actions): publish v3.19.0 to npm (#899)
github-actions[bot] Aug 30, 2024
c973a75
chore(deps-dev): bump micromatch from 4.0.5 to 4.0.8 (#900)
dependabot[bot] Sep 18, 2024
c9d67f3
chore(deps): bump axios from 1.6.8 to 1.7.4 (#896)
dependabot[bot] Sep 18, 2024
430137c
chore(deps-dev): bump webpack from 5.79.0 to 5.94.0 in /packages/conc…
dependabot[bot] Sep 18, 2024
288cd1e
chore(deps-dev): bump elliptic from 6.5.4 to 6.5.7 in /packages/conce…
dependabot[bot] Sep 18, 2024
6758cf8
fix(dcs): enableMapTypes in internal modelmanagers in dcsmanager (#905)
sanketshevkar Sep 20, 2024
04f606d
chore(actions): publish v3.19.1 to npm (#909)
sanketshevkar Sep 23, 2024
89651d1
chore(workflow): update workflow steps
dselman Sep 24, 2024
61fdc5a
npm workspaces and bug fixes (#912)
dselman Sep 26, 2024
25d555a
chore(actions): publish v3.19.2 to npm (#913)
github-actions[bot] Sep 26, 2024
b8c465f
chore(deps): update concerto deps (#923)
muhabdulkadir Oct 14, 2024
bcdbd34
feat(decorators): validate decorators against model (#916)
dselman Oct 16, 2024
a9b4c9c
fix(test)
dselman Oct 16, 2024
d4c61e1
debug
dselman Oct 17, 2024
5087bbf
chore(jest): update version (#925)
dselman Oct 21, 2024
d0d62c5
chore(version): bump package version to 3.19.3 (#927)
dselman Oct 21, 2024
eb8d102
chore(actions): publish v3.19.4 to npm (#930)
github-actions[bot] Oct 24, 2024
6e8abb9
chore(versions): use latest versions of other concerto packages (#932)
jamieshorten Nov 7, 2024
b10d02f
chore(actions): publish v3.19.5 to npm (#933)
github-actions[bot] Nov 7, 2024
03d7501
fix #552
Nov 8, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# These are supported funding model platforms

github: [accordproject]
27 changes: 17 additions & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
pull_request:
branches:
- main
- v4.0.0 # Temporary, while we prepare for merge to main

jobs:
build:
Expand All @@ -15,21 +16,21 @@ jobs:
strategy:
matrix:
node-version:
- 16.x
- 18.x
- 20.x
os:
- ubuntu-latest
- windows-latest
- macOS-latest
- macos-latest
- ubuntu-latest

runs-on: ${{ matrix.os }}

steps:
- name: git checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}

Expand All @@ -39,6 +40,13 @@ jobs:
NODE_OPTIONS: "--max_old_space_size=4096"
run: npm test

- name: Archive npm failure logs
uses: actions/upload-artifact@v4
if: failure()
with:
name: npm-logs
path: C:\npm\cache\_logs\

- name: Calculate code coverage
run: npm run coverage

Expand Down Expand Up @@ -78,10 +86,10 @@ jobs:

steps:
- name: git checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Use Node.js 18.x
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: 18.x

Expand All @@ -96,6 +104,5 @@ jobs:
- name: build and publish
run: |
npm config set //registry.npmjs.org/:_authToken ${{ secrets.NPM_TOKEN }}
npm version --no-git-tag-version --yes --exact ${{ steps.timestamp.outputs.stamp }}
npx lerna version --no-git-tag-version --yes --exact ${{ steps.timestamp.outputs.stamp }}
npx lerna exec -- npm publish --access public --tag=unstable 2>&1
npm version --workspaces --include-workspace-root --no-git-tag-version --yes --exact ${{ steps.timestamp.outputs.stamp }}
npm publish --workspaces --access public --tag=unstable 2>&1
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -56,7 +56,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
Expand All @@ -69,6 +69,6 @@ jobs:
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
13 changes: 6 additions & 7 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ jobs:

steps:
- name: git checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Use Node.js 16.x
- name: Use Node.js 20.x
uses: actions/setup-node@v1
with:
node-version: 16.x
node-version: 20.x

- run: npm ci
- run: npm run build --if-present
Expand All @@ -31,9 +31,8 @@ jobs:
- name: build and publish
run: |
npm config set //registry.npmjs.org/:_authToken ${{ secrets.NPM_TOKEN }}
npm version --no-git-tag-version --yes --exact ${{ github.event.release.tag_name }}
npx lerna version --no-git-tag-version --yes --exact ${{ github.event.release.tag_name }}
npx lerna exec -- npm publish --access public ${{ steps.tag.outputs.tag }} 2>&1
npm version --workspaces --include-workspace-root --no-git-tag-version --yes --exact ${{ github.event.release.tag_name }}
npm publish --workspaces --access public ${{ steps.tag.outputs.tag }} 2>&1

- name: Create PR to increment version
uses: peter-evans/create-pull-request@v3
Expand All @@ -52,4 +51,4 @@ jobs:
Update the package.json version numbers after publishing to NPM.
assignees: ${{ github.actor }}
reviewers: ${{ github.actor }}
draft: false
draft: false
7 changes: 3 additions & 4 deletions DEVELOPERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ We'd love for you to help develop improvements to Concerto technology! Please re

#### Building Concerto

To build Concerto, you clone the source code repository and use lerna to build:
To build Concerto, you clone the source code repository and use npm to build:

```shell
# Clone your Github repository:
Expand All @@ -22,8 +22,7 @@ cd concerto
git remote add upstream "https://github.com/accordproject/concerto.git"

# Install node.js dependencies:
npm install -g lerna
lerna bootstrap
npm i
```

[apdev]: https://github.com/accordproject/techdocs/blob/master/DEVELOPERS.md
[apdev]: https://github.com/accordproject/techdocs/blob/master/DEVELOPERS.md
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ $ concerto compare --old model.cto --new model-with-changes.cto

## Structure of the Code

Top level repository (concerto), with sub packages. Each sub-package is published as an independent npm module using `lerna`:
Top level repository (concerto), with sub packages. Each sub-package is published as an independent npm module using npm workspaces:
* [concerto-core](https://github.com/accordproject/concerto/tree/master/packages/concerto-core) : core library for model management/parsing/validation/serialization
* [concerto-util](https://github.com/accordproject/concerto/tree/master/packages/concerto-util) : contains utility functions used in other parts of the code and fundamentally independent from Concerto as a modeling language
* [concerto-cto](https://github.com/accordproject/concerto/tree/master/packages/concerto-cto) : contains the parser for the .cto syntax for Concerto. The parser now outputs a proper Concerto object, instance of the metamodel rather than a custom JSON object.
Expand Down
7 changes: 0 additions & 7 deletions lerna.json

This file was deleted.

56 changes: 56 additions & 0 deletions license-config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"ignore": [
"scripts/**",
"**/*.zip",
"**/changelog.txt",
"**/*.tgz",
"**/.git",
"**/*.pegjs",
"packages/concerto-cto/lib/parser.js",
"**/jest.config.js",
"packages/*/scripts/**",
"**/generated/**",
"node_modules",
"**/out/**",
"**/HEADER",
"**/[.]*",
"**/[.]*/**",
"**/test/**",
"**/*.cto",
"**/*.d.ts",
"**/*.md",
"**/coverage/**",
"log",
"LICENSE",
"HEADER",
"packages/concerto-core/api.txt",
"**/*.snap"
],
"license": "HEADER",
"defaultFormat": {
"prepend": "/*",
"append": "*/"
},
"licenseFormats": {
"js": {
"prepend": "/*",
"append": " */",
"eachLine": {
"prepend": " * "
}
},
"ts": {
"prepend": "/*",
"append": " */",
"eachLine": {
"prepend": " * "
}
},
"dotfile|^Dockerfile": {
"eachLine": {
"prepend": "# "
}
}
},
"trailingWhitespace": "TRIM"
}
Loading