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

(feature): Add encoding and source nodes #4240

Merged
merged 9 commits into from
Aug 9, 2024
Merged

(feature): Add encoding and source nodes #4240

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e39d298
(feature): Add encoding and source nodes
amckinney Aug 8, 2024
ad09bb5
Merge branch 'main' into amckinney/source/proto
amckinney Aug 8, 2024
e91bcc8
Update snapshots
amckinney Aug 8, 2024
54a8abe
Enable git-lfs for *fhir.json
amckinney Aug 9, 2024
056dbb4
Move protobufParser.test.ts adjacent to implementation
amckinney Aug 9, 2024
3c67cf8
Add source filepath modifier
amckinney Aug 9, 2024
130fbe1
Configure github_token
amckinney Aug 9, 2024
00e0f34
Update snapshots
amckinney Aug 9, 2024
664e076
Add simple-fhir snapshots
amckinney Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ seed/** linguist-generated=true
seed/**/seed.yml linguist-generated=false
seed/**/.mock linguist-generated=true
packages/ir-sdk/src/sdk/** linguist-generated=true
*fhir.json filter=lfs diff=lfs merge=lfs -text
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ jobs:
run: yarn install

- uses: bufbuild/buf-setup-action@v1.34.0
with:
github_token: ${{ github.token }}

- uses: actions/setup-go@v5
with:
Expand Down
34 changes: 34 additions & 0 deletions .github/workflows/seed.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ jobs:
run: yarn install

- uses: bufbuild/buf-setup-action@v1.34.0
with:
github_token: ${{ github.token }}

- uses: actions/setup-go@v5
with:
Expand Down Expand Up @@ -124,6 +126,8 @@ jobs:
run: yarn install

- uses: bufbuild/buf-setup-action@v1.34.0
with:
github_token: ${{ github.token }}

- uses: actions/setup-go@v5
with:
Expand Down Expand Up @@ -158,6 +162,8 @@ jobs:
run: yarn install

- uses: bufbuild/buf-setup-action@v1.34.0
with:
github_token: ${{ github.token }}

- uses: actions/setup-go@v5
with:
Expand Down Expand Up @@ -199,6 +205,8 @@ jobs:
run: yarn install

- uses: bufbuild/buf-setup-action@v1.34.0
with:
github_token: ${{ github.token }}

- uses: actions/setup-go@v5
with:
Expand Down Expand Up @@ -240,6 +248,8 @@ jobs:
run: yarn install

- uses: bufbuild/buf-setup-action@v1.34.0
with:
github_token: ${{ github.token }}

- uses: actions/setup-go@v5
with:
Expand Down Expand Up @@ -281,6 +291,8 @@ jobs:
run: yarn install

- uses: bufbuild/buf-setup-action@v1.34.0
with:
github_token: ${{ github.token }}

- uses: actions/setup-go@v5
with:
Expand Down Expand Up @@ -315,6 +327,8 @@ jobs:
run: yarn install

- uses: bufbuild/buf-setup-action@v1.34.0
with:
github_token: ${{ github.token }}

- uses: actions/setup-go@v5
with:
Expand Down Expand Up @@ -349,6 +363,8 @@ jobs:
run: yarn install

- uses: bufbuild/buf-setup-action@v1.34.0
with:
github_token: ${{ github.token }}

- uses: actions/setup-go@v5
with:
Expand Down Expand Up @@ -383,6 +399,8 @@ jobs:
run: yarn install

- uses: bufbuild/buf-setup-action@v1.34.0
with:
github_token: ${{ github.token }}

- uses: actions/setup-go@v5
with:
Expand Down Expand Up @@ -417,6 +435,8 @@ jobs:
run: yarn install

- uses: bufbuild/buf-setup-action@v1.34.0
with:
github_token: ${{ github.token }}

- uses: actions/setup-go@v5
with:
Expand Down Expand Up @@ -451,6 +471,8 @@ jobs:
run: yarn install

- uses: bufbuild/buf-setup-action@v1.34.0
with:
github_token: ${{ github.token }}

- uses: actions/setup-go@v5
with:
Expand Down Expand Up @@ -485,6 +507,8 @@ jobs:
run: yarn install

- uses: bufbuild/buf-setup-action@v1.34.0
with:
github_token: ${{ github.token }}

- uses: actions/setup-go@v5
with:
Expand Down Expand Up @@ -519,6 +543,8 @@ jobs:
run: yarn install

- uses: bufbuild/buf-setup-action@v1.34.0
with:
github_token: ${{ github.token }}

- uses: actions/setup-go@v5
with:
Expand Down Expand Up @@ -553,6 +579,8 @@ jobs:
run: yarn install

- uses: bufbuild/buf-setup-action@v1.34.0
with:
github_token: ${{ github.token }}

- uses: actions/setup-go@v5
with:
Expand Down Expand Up @@ -587,6 +615,8 @@ jobs:
run: yarn install

- uses: bufbuild/buf-setup-action@v1.34.0
with:
github_token: ${{ github.token }}

- uses: actions/setup-go@v5
with:
Expand Down Expand Up @@ -621,6 +651,8 @@ jobs:
run: yarn install

- uses: bufbuild/buf-setup-action@v1.34.0
with:
github_token: ${{ github.token }}

- uses: actions/setup-go@v5
with:
Expand Down Expand Up @@ -655,6 +687,8 @@ jobs:
run: yarn install

- uses: bufbuild/buf-setup-action@v1.34.0
with:
github_token: ${{ github.token }}

- uses: actions/setup-go@v5
with:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/setup-seed.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ jobs:
run: yarn install

- uses: bufbuild/buf-setup-action@v1.34.0
with:
github_token: ${{ github.token }}

- uses: actions/setup-go@v5
with:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-definitions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ jobs:
run: yarn install

- uses: bufbuild/buf-setup-action@v1.34.0
with:
github_token: ${{ github.token }}

- uses: actions/setup-go@v5
with:
Expand Down
34 changes: 33 additions & 1 deletion fern.schema.dev.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,32 @@
},
"additionalProperties": false
},
"source": {
"anyOf": [
{
"type": "object",
"properties": {
"proto": {
"type": "string",
"description": "The Protobuf filepath that defined this node."
}
},
"required": ["proto"],
"additionalProperties": false
},
{
"type": "object",
"properties": {
"openapi": {
"type": "string",
"description": "The OpenAPI filepath that defined this node."
}
},
"required": ["openapi"],
"additionalProperties": false
}
]
},
"extensions": { "type": "object", "additionalProperties": {} },
"extends": {
"anyOf": [{ "type": "string" }, { "type": "array", "items": { "type": "string" } }]
Expand Down Expand Up @@ -147,6 +173,7 @@
"encoding": {
"$ref": "#/properties/types/additionalProperties/anyOf/1/anyOf/0/properties/encoding"
},
"source": { "$ref": "#/properties/types/additionalProperties/anyOf/1/anyOf/0/properties/source" },
"extensions": { "type": "object", "additionalProperties": {} },
"extends": {
"$ref": "#/properties/types/additionalProperties/anyOf/1/anyOf/0/properties/extends"
Expand Down Expand Up @@ -176,6 +203,7 @@
},
"examples": { "$ref": "#/properties/types/additionalProperties/anyOf/1/anyOf/0/properties/examples" },
"encoding": { "$ref": "#/properties/types/additionalProperties/anyOf/1/anyOf/0/properties/encoding" },
"source": { "$ref": "#/properties/types/additionalProperties/anyOf/1/anyOf/0/properties/source" },
"base-properties": {
"type": "object",
"additionalProperties": {
Expand Down Expand Up @@ -257,6 +285,7 @@
},
"examples": { "$ref": "#/properties/types/additionalProperties/anyOf/1/anyOf/0/properties/examples" },
"encoding": { "$ref": "#/properties/types/additionalProperties/anyOf/1/anyOf/0/properties/encoding" },
"source": { "$ref": "#/properties/types/additionalProperties/anyOf/1/anyOf/0/properties/source" },
"type": { "type": "string" },
"validation": {
"$ref": "#/properties/types/additionalProperties/anyOf/1/anyOf/0/properties/properties/additionalProperties/anyOf/1/properties/validation"
Expand All @@ -277,6 +306,7 @@
},
"examples": { "$ref": "#/properties/types/additionalProperties/anyOf/1/anyOf/0/properties/examples" },
"encoding": { "$ref": "#/properties/types/additionalProperties/anyOf/1/anyOf/0/properties/encoding" },
"source": { "$ref": "#/properties/types/additionalProperties/anyOf/1/anyOf/0/properties/source" },
"default": { "type": "string" },
"enum": {
"type": "array",
Expand Down Expand Up @@ -326,6 +356,7 @@
},
"examples": { "$ref": "#/properties/types/additionalProperties/anyOf/1/anyOf/0/properties/examples" },
"encoding": { "$ref": "#/properties/types/additionalProperties/anyOf/1/anyOf/0/properties/encoding" },
"source": { "$ref": "#/properties/types/additionalProperties/anyOf/1/anyOf/0/properties/source" },
"union": {
"type": "array",
"items": {
Expand Down Expand Up @@ -822,7 +853,8 @@
"required": ["path"],
"additionalProperties": false
}
}
},
"source": { "$ref": "#/properties/types/additionalProperties/anyOf/1/anyOf/0/properties/source" }
},
"required": ["auth", "base-path", "endpoints"],
"additionalProperties": false
Expand Down
34 changes: 33 additions & 1 deletion fern.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,32 @@
},
"additionalProperties": false
},
"source": {
"anyOf": [
{
"type": "object",
"properties": {
"proto": {
"type": "string",
"description": "The Protobuf filepath that defined this node."
}
},
"required": ["proto"],
"additionalProperties": false
},
{
"type": "object",
"properties": {
"openapi": {
"type": "string",
"description": "The OpenAPI filepath that defined this node."
}
},
"required": ["openapi"],
"additionalProperties": false
}
]
},
"extensions": { "type": "object", "additionalProperties": {} },
"extends": {
"anyOf": [{ "type": "string" }, { "type": "array", "items": { "type": "string" } }]
Expand Down Expand Up @@ -147,6 +173,7 @@
"encoding": {
"$ref": "#/properties/types/additionalProperties/anyOf/1/anyOf/0/properties/encoding"
},
"source": { "$ref": "#/properties/types/additionalProperties/anyOf/1/anyOf/0/properties/source" },
"extensions": { "type": "object", "additionalProperties": {} },
"extends": {
"$ref": "#/properties/types/additionalProperties/anyOf/1/anyOf/0/properties/extends"
Expand Down Expand Up @@ -176,6 +203,7 @@
},
"examples": { "$ref": "#/properties/types/additionalProperties/anyOf/1/anyOf/0/properties/examples" },
"encoding": { "$ref": "#/properties/types/additionalProperties/anyOf/1/anyOf/0/properties/encoding" },
"source": { "$ref": "#/properties/types/additionalProperties/anyOf/1/anyOf/0/properties/source" },
"base-properties": {
"type": "object",
"additionalProperties": {
Expand Down Expand Up @@ -257,6 +285,7 @@
},
"examples": { "$ref": "#/properties/types/additionalProperties/anyOf/1/anyOf/0/properties/examples" },
"encoding": { "$ref": "#/properties/types/additionalProperties/anyOf/1/anyOf/0/properties/encoding" },
"source": { "$ref": "#/properties/types/additionalProperties/anyOf/1/anyOf/0/properties/source" },
"type": { "type": "string" },
"validation": {
"$ref": "#/properties/types/additionalProperties/anyOf/1/anyOf/0/properties/properties/additionalProperties/anyOf/1/properties/validation"
Expand All @@ -277,6 +306,7 @@
},
"examples": { "$ref": "#/properties/types/additionalProperties/anyOf/1/anyOf/0/properties/examples" },
"encoding": { "$ref": "#/properties/types/additionalProperties/anyOf/1/anyOf/0/properties/encoding" },
"source": { "$ref": "#/properties/types/additionalProperties/anyOf/1/anyOf/0/properties/source" },
"default": { "type": "string" },
"enum": {
"type": "array",
Expand Down Expand Up @@ -326,6 +356,7 @@
},
"examples": { "$ref": "#/properties/types/additionalProperties/anyOf/1/anyOf/0/properties/examples" },
"encoding": { "$ref": "#/properties/types/additionalProperties/anyOf/1/anyOf/0/properties/encoding" },
"source": { "$ref": "#/properties/types/additionalProperties/anyOf/1/anyOf/0/properties/source" },
"union": {
"type": "array",
"items": {
Expand Down Expand Up @@ -822,7 +853,8 @@
"required": ["path"],
"additionalProperties": false
}
}
},
"source": { "$ref": "#/properties/types/additionalProperties/anyOf/1/anyOf/0/properties/source" }
},
"required": ["auth", "base-path", "endpoints"],
"additionalProperties": false
Expand Down
1 change: 1 addition & 0 deletions packages/cli/cli/src/commands/generate-openapi-ir/generateOpenAPIIrForWorkspaces.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export async function generateOpenAPIIrForWorkspaces({
}
const openAPISpecs = await getAllOpenAPISpecs({ context, specs: workspace.specs });
const openAPIIr = await parse({
absoluteFilePathToWorkspace: workspace.absoluteFilepath,
specs: openAPISpecs,
taskContext: context
});
Expand Down
1 change: 1 addition & 0 deletions packages/cli/cli/src/commands/generate-overrides/writeOverridesForWorkspaces.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ async function writeDefinitionForOpenAPIWorkspace({
const specs = await getAllOpenAPISpecs({ context, specs: workspace.specs });
for (const spec of specs) {
const ir = await parse({
absoluteFilePathToWorkspace: workspace.absoluteFilepath,
specs: [spec],
taskContext: context
});
Expand Down
Loading
Loading