diff --git a/.circleci/config.yml b/.circleci/config.yml index 7fa11325a9a..fd2a5e8533b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,106 +2,6 @@ version: 2.1 orbs: node: circleci/node@5.0.1 jobs: - check: - docker: - - image: cimg/node:18.8.0 - resource_class: large - steps: - - checkout - - node/install-packages: - pkg-manager: yarn-berry - - run: - name: lint:monorepo - command: yarn lint:monorepo - - run: - name: Check root package - command: yarn root-package:check - - run: - name: Check dependencies - command: yarn depcheck - - run: - name: lint:style - command: yarn lint:style - - run: - name: fern check - command: npx fern-api check - - run: - name: fern check test definitons - command: | - yarn workspace @fern-api/cli dist:cli:dev - cd test-definitions - node $(yarn workspace @fern-api/cli bin fern:dev) check - - run: - name: generate (dev) JSON Schema - command: yarn generate-json-schema:dev - - run: - name: Format - command: yarn format:check - - run: - name: Ensure no changes to git-tracked files - command: git --no-pager diff --exit-code - - eslint: - docker: - - image: cimg/node:18.8.0 - resource_class: large - steps: - - checkout - - node/install-packages: - pkg-manager: yarn-berry - - run: - # compilation is needed for some typescript-eslint rules - name: compile - command: yarn compile - - run: - name: lint:eslint - command: yarn lint:eslint - - compile: - docker: - - image: cimg/node:18.8.0 - resource_class: large - steps: - - checkout - - node/install-packages: - pkg-manager: yarn-berry - - run: - name: compile - command: yarn compile - - test: - # this is machine because of the docker-utils tests - machine: - image: ubuntu-2004:current - steps: - - checkout - - node/install-packages: - pkg-manager: yarn-berry - - run: - name: Run tests - command: yarn test --ci - - run: - name: Ensure no changes to git-tracked files - command: git --no-pager diff --exit-code - - ete-tests: - # this is machine because of the local generation tests - machine: - image: ubuntu-2004:current - steps: - - checkout - - node/install-packages: - pkg-manager: yarn-berry - - run: - name: Run ETE tests - command: | - echo 'export FERN_TOKEN="$FERN_ORG_TOKEN_DEV"' >> $BASH_ENV - source "$BASH_ENV" - yarn test:ete - - run: - name: Ensure no changes to git-tracked files - command: git --no-pager diff --exit-code - live-test-dev: docker: - image: cimg/node:18.8.0 @@ -242,54 +142,10 @@ jobs: export FERN_TOKEN="$FERN_ORG_TOKEN_PROD" npx fern-api generate --api ir-types-v31 --group sdks - check-cli-release-is-allowed: - docker: - - image: cimg/node:18.8.0 - steps: - - checkout - - node/install-packages: - pkg-manager: yarn-berry - - run: - name: Check release blockers - command: yarn check-cli-release-blockers - - run: - name: Ensure JSON schema is up to date - command: | - yarn generate-json-schema - git --no-pager diff --exit-code - workflows: version: 2 build: jobs: - - check: - filters: - tags: - only: /.*/ - - - eslint: - filters: - tags: - only: /.*/ - - - compile: - filters: - tags: - only: /.*/ - - - test: - filters: - tags: - only: /.*/ - - - ete-tests: - filters: - tags: - only: /.*/ - context: - - auth0-dev - - fern-tokens - - live-test-dev: filters: tags: @@ -313,12 +169,6 @@ workflows: filters: branches: only: main - requires: - - check - - compile - - eslint - - test - - ete-tests context: - npm - auth0-dev @@ -330,11 +180,6 @@ workflows: tags: only: /^([0-9]+)\.([0-9]+)\.([0-9]+)-rc([0-9]+)$/ requires: - - check - - compile - - eslint - - test - - ete-tests - live-test-dev context: - npm @@ -348,12 +193,6 @@ workflows: tags: only: /^([0-9]+)\.([0-9]+)\.([0-9]+)$/ requires: - - check-cli-release-is-allowed - - check - - compile - - eslint - - test - - ete-tests - live-test-dev - live-test context: @@ -368,18 +207,6 @@ workflows: tags: only: /.*/ requires: - - check - - compile - - eslint - - test - - ete-tests - live-test-dev context: - fern-tokens - - - check-cli-release-is-allowed: - filters: - branches: - ignore: /.*/ - tags: - only: /^([0-9]+)\.([0-9]+)\.([0-9]+)$/ diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000000..716011f1b76 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,98 @@ +name: ci +on: [push] + +jobs: + lint: + runs-on: ubuntu-latest + steps: + - name: Checkout repo + uses: actions/checkout@v4 + + - uses: actions/setup-node@v3 + with: + node-version: 18 + cache: "yarn" + + - name: Install + run: yarn install + + - name: Lint Monorepo + run: yarn lint:monorepo + + - name: Check dependencies + run: yarn depcheck + + - name: Lint + run: yarn lint:style + + - name: generate (dev) JSON Schema + run: yarn generate-json-schema:dev + + - name: Format + run: yarn format:check + + - name: Ensure no changes to git-tracked files + run: git --no-pager diff --exit-code + + compile: + runs-on: ubuntu-latest + steps: + - name: Checkout repo + uses: actions/checkout@v4 + + - uses: actions/setup-node@v3 + with: + node-version: 18 + cache: "yarn" + + - name: Install + run: yarn install + + - name: compile + run: yarn compile + + - name: lint:eslint + run: yarn lint:eslint + + test: + runs-on: ubuntu-latest + steps: + - name: Checkout repo + uses: actions/checkout@v4 + + - uses: actions/setup-node@v3 + with: + node-version: 18 + cache: "yarn" + + - name: Install + run: yarn install + + - name: Run tests + run: yarn test --ci + + - name: Ensure no changes to git-tracked files + run: git --no-pager diff --exit-code + + ete-tests: + runs-on: ubuntu-latest + steps: + - name: Checkout repo + uses: actions/checkout@v4 + + - uses: actions/setup-node@v3 + with: + node-version: 18 + cache: "yarn" + + - name: Install + run: yarn install + + - name: Run ETE tests + env: + FERN_ORG_TOKEN_DEV: ${{ secrets.FERN_ORG_TOKEN_DEV }} + run: | + FERN_TOKEN=${{ secrets.FERN_ORG_TOKEN_DEV }} yarn test:ete + + - name: Ensure no changes to git-tracked files + run: git --no-pager diff --exit-code diff --git a/.github/workflows/test-definitions.yml b/.github/workflows/fern.yml similarity index 61% rename from .github/workflows/test-definitions.yml rename to .github/workflows/fern.yml index aaa11958685..80839860ad8 100644 --- a/.github/workflows/test-definitions.yml +++ b/.github/workflows/fern.yml @@ -1,12 +1,20 @@ -name: test-definitions - -on: - pull_request: - branches: - - main +name: fern +on: [push] jobs: - fern-check: + check-ir-definitions: + runs-on: ubuntu-latest + steps: + - name: Checkout repo + uses: actions/checkout@v4 + + - name: Install Fern + run: npm install -g fern-api + + - name: Check Fern API is valid + run: fern check + + check-test-definitions: runs-on: ubuntu-latest steps: - name: Checkout repo diff --git a/.pnp.cjs b/.pnp.cjs index abc0e8f5fa8..4744d09502a 100644 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -256,7 +256,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["jsonc-parser", "npm:2.2.1"],\ ["lint-staged", "npm:13.0.3"],\ ["lodash-es", "npm:4.17.21"],\ - ["mrlint", "npm:0.0.125"],\ + ["mrlint", "npm:0.0.131"],\ ["organize-imports-cli", "npm:0.10.0"],\ ["prettier", "npm:2.7.1"],\ ["react", "npm:18.2.0"],\ @@ -10718,7 +10718,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["jsonc-parser", "npm:2.2.1"],\ ["lint-staged", "npm:13.0.3"],\ ["lodash-es", "npm:4.17.21"],\ - ["mrlint", "npm:0.0.125"],\ + ["mrlint", "npm:0.0.131"],\ ["organize-imports-cli", "npm:0.10.0"],\ ["prettier", "npm:2.7.1"],\ ["react", "npm:18.2.0"],\ @@ -14789,10 +14789,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { }]\ ]],\ ["mrlint", [\ - ["npm:0.0.125", {\ - "packageLocation": "./.yarn/cache/mrlint-npm-0.0.125-55d643b35d-bde995c273.zip/node_modules/mrlint/",\ + ["npm:0.0.131", {\ + "packageLocation": "./.yarn/cache/mrlint-npm-0.0.131-a9267ed6b0-664798f33f.zip/node_modules/mrlint/",\ "packageDependencies": [\ - ["mrlint", "npm:0.0.125"]\ + ["mrlint", "npm:0.0.131"]\ ],\ "linkType": "HARD"\ }]\ diff --git a/.yarn/cache/mrlint-npm-0.0.125-55d643b35d-bde995c273.zip b/.yarn/cache/mrlint-npm-0.0.125-55d643b35d-bde995c273.zip deleted file mode 100644 index 1310c1df775..00000000000 Binary files a/.yarn/cache/mrlint-npm-0.0.125-55d643b35d-bde995c273.zip and /dev/null differ diff --git a/.yarn/cache/mrlint-npm-0.0.131-a9267ed6b0-664798f33f.zip b/.yarn/cache/mrlint-npm-0.0.131-a9267ed6b0-664798f33f.zip new file mode 100644 index 00000000000..c1a16cd33ab Binary files /dev/null and b/.yarn/cache/mrlint-npm-0.0.131-a9267ed6b0-664798f33f.zip differ diff --git a/fern/docs-config/definition/api.yml b/fern/apis/docs-config/definition/api.yml similarity index 100% rename from fern/docs-config/definition/api.yml rename to fern/apis/docs-config/definition/api.yml diff --git a/fern/docs-config/definition/docs.yml b/fern/apis/docs-config/definition/docs.yml similarity index 100% rename from fern/docs-config/definition/docs.yml rename to fern/apis/docs-config/definition/docs.yml diff --git a/fern/docs-config/generators.yml b/fern/apis/docs-config/generators.yml similarity index 80% rename from fern/docs-config/generators.yml rename to fern/apis/docs-config/generators.yml index 064bcb613a3..5ec1ade7bc4 100644 --- a/fern/docs-config/generators.yml +++ b/fern/apis/docs-config/generators.yml @@ -7,4 +7,4 @@ groups: output: location: npm url: npm.buildwithfern.com - package-name: "@fern-fern/docs-config" + package-name: '@fern-fern/docs-config' diff --git a/fern/fhir/definition/__package__.yml b/fern/apis/fhir/definition/__package__.yml similarity index 100% rename from fern/fhir/definition/__package__.yml rename to fern/apis/fhir/definition/__package__.yml diff --git a/fern/fhir/definition/api.yml b/fern/apis/fhir/definition/api.yml similarity index 100% rename from fern/fhir/definition/api.yml rename to fern/apis/fhir/definition/api.yml diff --git a/fern/fhir/generators.yml b/fern/apis/fhir/generators.yml similarity index 87% rename from fern/fhir/generators.yml rename to fern/apis/fhir/generators.yml index 10771cf6965..3fc6af4c661 100644 --- a/fern/fhir/generators.yml +++ b/fern/apis/fhir/generators.yml @@ -7,7 +7,7 @@ groups: output: location: npm url: npm.buildwithfern.com - package-name: "@fern-fern/fhir-model" + package-name: '@fern-fern/fhir-model' config: useBrandedStringAliases: true noSerdeLayer: true diff --git a/fern/ir-types-v1/definition/api.yml b/fern/apis/ir-types-v1/definition/api.yml similarity index 100% rename from fern/ir-types-v1/definition/api.yml rename to fern/apis/ir-types-v1/definition/api.yml diff --git a/fern/ir-types-v1/definition/auth.yml b/fern/apis/ir-types-v1/definition/auth.yml similarity index 100% rename from fern/ir-types-v1/definition/auth.yml rename to fern/apis/ir-types-v1/definition/auth.yml diff --git a/fern/ir-types-v1/definition/commons.yml b/fern/apis/ir-types-v1/definition/commons.yml similarity index 100% rename from fern/ir-types-v1/definition/commons.yml rename to fern/apis/ir-types-v1/definition/commons.yml diff --git a/fern/ir-types-v1/definition/constants.yml b/fern/apis/ir-types-v1/definition/constants.yml similarity index 100% rename from fern/ir-types-v1/definition/constants.yml rename to fern/apis/ir-types-v1/definition/constants.yml diff --git a/fern/ir-types-v1/definition/declaration.yml b/fern/apis/ir-types-v1/definition/declaration.yml similarity index 100% rename from fern/ir-types-v1/definition/declaration.yml rename to fern/apis/ir-types-v1/definition/declaration.yml diff --git a/fern/ir-types-v1/definition/environment.yml b/fern/apis/ir-types-v1/definition/environment.yml similarity index 100% rename from fern/ir-types-v1/definition/environment.yml rename to fern/apis/ir-types-v1/definition/environment.yml diff --git a/fern/ir-types-v1/definition/errors.yml b/fern/apis/ir-types-v1/definition/errors.yml similarity index 100% rename from fern/ir-types-v1/definition/errors.yml rename to fern/apis/ir-types-v1/definition/errors.yml diff --git a/fern/ir-types-v1/definition/ir.yml b/fern/apis/ir-types-v1/definition/ir.yml similarity index 100% rename from fern/ir-types-v1/definition/ir.yml rename to fern/apis/ir-types-v1/definition/ir.yml diff --git a/fern/ir-types-v1/definition/services/commons.yml b/fern/apis/ir-types-v1/definition/services/commons.yml similarity index 100% rename from fern/ir-types-v1/definition/services/commons.yml rename to fern/apis/ir-types-v1/definition/services/commons.yml diff --git a/fern/ir-types-v1/definition/services/http.yml b/fern/apis/ir-types-v1/definition/services/http.yml similarity index 100% rename from fern/ir-types-v1/definition/services/http.yml rename to fern/apis/ir-types-v1/definition/services/http.yml diff --git a/fern/ir-types-v1/definition/services/websocket.yml b/fern/apis/ir-types-v1/definition/services/websocket.yml similarity index 100% rename from fern/ir-types-v1/definition/services/websocket.yml rename to fern/apis/ir-types-v1/definition/services/websocket.yml diff --git a/fern/ir-types-v1/definition/types.yml b/fern/apis/ir-types-v1/definition/types.yml similarity index 100% rename from fern/ir-types-v1/definition/types.yml rename to fern/apis/ir-types-v1/definition/types.yml diff --git a/fern/ir-types-v1/generators.yml b/fern/apis/ir-types-v1/generators.yml similarity index 92% rename from fern/ir-types-v1/generators.yml rename to fern/apis/ir-types-v1/generators.yml index 87cf5416419..52eebe28285 100644 --- a/fern/ir-types-v1/generators.yml +++ b/fern/apis/ir-types-v1/generators.yml @@ -15,4 +15,4 @@ groups: - name: fernapi/fern-pydantic-model version: 0.0.33-5-g3540939 config: - wrapped_aliases: True + wrapped_aliases: true diff --git a/fern/ir-types-v10/definition/api.yml b/fern/apis/ir-types-v10/definition/api.yml similarity index 100% rename from fern/ir-types-v10/definition/api.yml rename to fern/apis/ir-types-v10/definition/api.yml diff --git a/fern/ir-types-v10/definition/auth.yml b/fern/apis/ir-types-v10/definition/auth.yml similarity index 100% rename from fern/ir-types-v10/definition/auth.yml rename to fern/apis/ir-types-v10/definition/auth.yml diff --git a/fern/ir-types-v10/definition/commons.yml b/fern/apis/ir-types-v10/definition/commons.yml similarity index 100% rename from fern/ir-types-v10/definition/commons.yml rename to fern/apis/ir-types-v10/definition/commons.yml diff --git a/fern/ir-types-v10/definition/constants.yml b/fern/apis/ir-types-v10/definition/constants.yml similarity index 100% rename from fern/ir-types-v10/definition/constants.yml rename to fern/apis/ir-types-v10/definition/constants.yml diff --git a/fern/ir-types-v10/definition/environment.yml b/fern/apis/ir-types-v10/definition/environment.yml similarity index 100% rename from fern/ir-types-v10/definition/environment.yml rename to fern/apis/ir-types-v10/definition/environment.yml diff --git a/fern/ir-types-v10/definition/errors.yml b/fern/apis/ir-types-v10/definition/errors.yml similarity index 100% rename from fern/ir-types-v10/definition/errors.yml rename to fern/apis/ir-types-v10/definition/errors.yml diff --git a/fern/ir-types-v10/definition/http.yml b/fern/apis/ir-types-v10/definition/http.yml similarity index 100% rename from fern/ir-types-v10/definition/http.yml rename to fern/apis/ir-types-v10/definition/http.yml diff --git a/fern/ir-types-v10/definition/ir.yml b/fern/apis/ir-types-v10/definition/ir.yml similarity index 100% rename from fern/ir-types-v10/definition/ir.yml rename to fern/apis/ir-types-v10/definition/ir.yml diff --git a/fern/ir-types-v10/definition/types.yml b/fern/apis/ir-types-v10/definition/types.yml similarity index 100% rename from fern/ir-types-v10/definition/types.yml rename to fern/apis/ir-types-v10/definition/types.yml diff --git a/fern/ir-types-v6/generators.yml b/fern/apis/ir-types-v10/generators.yml similarity index 99% rename from fern/ir-types-v6/generators.yml rename to fern/apis/ir-types-v10/generators.yml index cbb0277fcea..a0b6695f9b0 100644 --- a/fern/ir-types-v6/generators.yml +++ b/fern/apis/ir-types-v10/generators.yml @@ -12,7 +12,6 @@ groups: version: 0.0.130-2-g36322d7 config: wrapped-aliases: true - - name: fernapi/fern-pydantic-model version: 0.0.34-1-g024c753 config: diff --git a/fern/ir-types-v11/definition/api.yml b/fern/apis/ir-types-v11/definition/api.yml similarity index 100% rename from fern/ir-types-v11/definition/api.yml rename to fern/apis/ir-types-v11/definition/api.yml diff --git a/fern/ir-types-v11/definition/auth.yml b/fern/apis/ir-types-v11/definition/auth.yml similarity index 100% rename from fern/ir-types-v11/definition/auth.yml rename to fern/apis/ir-types-v11/definition/auth.yml diff --git a/fern/ir-types-v11/definition/commons.yml b/fern/apis/ir-types-v11/definition/commons.yml similarity index 100% rename from fern/ir-types-v11/definition/commons.yml rename to fern/apis/ir-types-v11/definition/commons.yml diff --git a/fern/ir-types-v11/definition/constants.yml b/fern/apis/ir-types-v11/definition/constants.yml similarity index 100% rename from fern/ir-types-v11/definition/constants.yml rename to fern/apis/ir-types-v11/definition/constants.yml diff --git a/fern/ir-types-v11/definition/environment.yml b/fern/apis/ir-types-v11/definition/environment.yml similarity index 100% rename from fern/ir-types-v11/definition/environment.yml rename to fern/apis/ir-types-v11/definition/environment.yml diff --git a/fern/ir-types-v11/definition/errors.yml b/fern/apis/ir-types-v11/definition/errors.yml similarity index 100% rename from fern/ir-types-v11/definition/errors.yml rename to fern/apis/ir-types-v11/definition/errors.yml diff --git a/fern/ir-types-v11/definition/http.yml b/fern/apis/ir-types-v11/definition/http.yml similarity index 100% rename from fern/ir-types-v11/definition/http.yml rename to fern/apis/ir-types-v11/definition/http.yml diff --git a/fern/ir-types-v11/definition/ir.yml b/fern/apis/ir-types-v11/definition/ir.yml similarity index 100% rename from fern/ir-types-v11/definition/ir.yml rename to fern/apis/ir-types-v11/definition/ir.yml diff --git a/fern/ir-types-v11/definition/types.yml b/fern/apis/ir-types-v11/definition/types.yml similarity index 100% rename from fern/ir-types-v11/definition/types.yml rename to fern/apis/ir-types-v11/definition/types.yml diff --git a/fern/ir-types-v10/generators.yml b/fern/apis/ir-types-v11/generators.yml similarity index 99% rename from fern/ir-types-v10/generators.yml rename to fern/apis/ir-types-v11/generators.yml index cbb0277fcea..a0b6695f9b0 100644 --- a/fern/ir-types-v10/generators.yml +++ b/fern/apis/ir-types-v11/generators.yml @@ -12,7 +12,6 @@ groups: version: 0.0.130-2-g36322d7 config: wrapped-aliases: true - - name: fernapi/fern-pydantic-model version: 0.0.34-1-g024c753 config: diff --git a/fern/ir-types-v12/definition/api.yml b/fern/apis/ir-types-v12/definition/api.yml similarity index 100% rename from fern/ir-types-v12/definition/api.yml rename to fern/apis/ir-types-v12/definition/api.yml diff --git a/fern/ir-types-v12/definition/auth.yml b/fern/apis/ir-types-v12/definition/auth.yml similarity index 100% rename from fern/ir-types-v12/definition/auth.yml rename to fern/apis/ir-types-v12/definition/auth.yml diff --git a/fern/ir-types-v12/definition/commons.yml b/fern/apis/ir-types-v12/definition/commons.yml similarity index 100% rename from fern/ir-types-v12/definition/commons.yml rename to fern/apis/ir-types-v12/definition/commons.yml diff --git a/fern/ir-types-v12/definition/constants.yml b/fern/apis/ir-types-v12/definition/constants.yml similarity index 100% rename from fern/ir-types-v12/definition/constants.yml rename to fern/apis/ir-types-v12/definition/constants.yml diff --git a/fern/ir-types-v12/definition/environment.yml b/fern/apis/ir-types-v12/definition/environment.yml similarity index 100% rename from fern/ir-types-v12/definition/environment.yml rename to fern/apis/ir-types-v12/definition/environment.yml diff --git a/fern/ir-types-v12/definition/errors.yml b/fern/apis/ir-types-v12/definition/errors.yml similarity index 100% rename from fern/ir-types-v12/definition/errors.yml rename to fern/apis/ir-types-v12/definition/errors.yml diff --git a/fern/ir-types-v12/definition/http.yml b/fern/apis/ir-types-v12/definition/http.yml similarity index 100% rename from fern/ir-types-v12/definition/http.yml rename to fern/apis/ir-types-v12/definition/http.yml diff --git a/fern/ir-types-v12/definition/ir.yml b/fern/apis/ir-types-v12/definition/ir.yml similarity index 100% rename from fern/ir-types-v12/definition/ir.yml rename to fern/apis/ir-types-v12/definition/ir.yml diff --git a/fern/ir-types-v12/definition/types.yml b/fern/apis/ir-types-v12/definition/types.yml similarity index 100% rename from fern/ir-types-v12/definition/types.yml rename to fern/apis/ir-types-v12/definition/types.yml diff --git a/fern/ir-types-v12/generators.yml b/fern/apis/ir-types-v12/generators.yml similarity index 100% rename from fern/ir-types-v12/generators.yml rename to fern/apis/ir-types-v12/generators.yml diff --git a/fern/ir-types-v13/definition/api.yml b/fern/apis/ir-types-v13/definition/api.yml similarity index 100% rename from fern/ir-types-v13/definition/api.yml rename to fern/apis/ir-types-v13/definition/api.yml diff --git a/fern/ir-types-v13/definition/auth.yml b/fern/apis/ir-types-v13/definition/auth.yml similarity index 100% rename from fern/ir-types-v13/definition/auth.yml rename to fern/apis/ir-types-v13/definition/auth.yml diff --git a/fern/ir-types-v13/definition/commons.yml b/fern/apis/ir-types-v13/definition/commons.yml similarity index 100% rename from fern/ir-types-v13/definition/commons.yml rename to fern/apis/ir-types-v13/definition/commons.yml diff --git a/fern/ir-types-v13/definition/constants.yml b/fern/apis/ir-types-v13/definition/constants.yml similarity index 100% rename from fern/ir-types-v13/definition/constants.yml rename to fern/apis/ir-types-v13/definition/constants.yml diff --git a/fern/ir-types-v13/definition/environment.yml b/fern/apis/ir-types-v13/definition/environment.yml similarity index 100% rename from fern/ir-types-v13/definition/environment.yml rename to fern/apis/ir-types-v13/definition/environment.yml diff --git a/fern/ir-types-v13/definition/errors.yml b/fern/apis/ir-types-v13/definition/errors.yml similarity index 100% rename from fern/ir-types-v13/definition/errors.yml rename to fern/apis/ir-types-v13/definition/errors.yml diff --git a/fern/ir-types-v13/definition/http.yml b/fern/apis/ir-types-v13/definition/http.yml similarity index 100% rename from fern/ir-types-v13/definition/http.yml rename to fern/apis/ir-types-v13/definition/http.yml diff --git a/fern/ir-types-v13/definition/ir.yml b/fern/apis/ir-types-v13/definition/ir.yml similarity index 100% rename from fern/ir-types-v13/definition/ir.yml rename to fern/apis/ir-types-v13/definition/ir.yml diff --git a/fern/ir-types-v13/definition/types.yml b/fern/apis/ir-types-v13/definition/types.yml similarity index 100% rename from fern/ir-types-v13/definition/types.yml rename to fern/apis/ir-types-v13/definition/types.yml diff --git a/fern/ir-types-v14/generators.yml b/fern/apis/ir-types-v13/generators.yml similarity index 99% rename from fern/ir-types-v14/generators.yml rename to fern/apis/ir-types-v13/generators.yml index 7a94a54cac7..1107a0e4bcc 100644 --- a/fern/ir-types-v14/generators.yml +++ b/fern/apis/ir-types-v13/generators.yml @@ -13,7 +13,6 @@ groups: config: wrapped-aliases: true enable-forward-compatible-enums: true - - name: fernapi/fern-pydantic-model version: 0.0.34-1-g024c753 config: diff --git a/fern/ir-types-v14/definition/api.yml b/fern/apis/ir-types-v14/definition/api.yml similarity index 100% rename from fern/ir-types-v14/definition/api.yml rename to fern/apis/ir-types-v14/definition/api.yml diff --git a/fern/ir-types-v14/definition/auth.yml b/fern/apis/ir-types-v14/definition/auth.yml similarity index 100% rename from fern/ir-types-v14/definition/auth.yml rename to fern/apis/ir-types-v14/definition/auth.yml diff --git a/fern/ir-types-v14/definition/commons.yml b/fern/apis/ir-types-v14/definition/commons.yml similarity index 100% rename from fern/ir-types-v14/definition/commons.yml rename to fern/apis/ir-types-v14/definition/commons.yml diff --git a/fern/ir-types-v14/definition/constants.yml b/fern/apis/ir-types-v14/definition/constants.yml similarity index 100% rename from fern/ir-types-v14/definition/constants.yml rename to fern/apis/ir-types-v14/definition/constants.yml diff --git a/fern/ir-types-v14/definition/environment.yml b/fern/apis/ir-types-v14/definition/environment.yml similarity index 100% rename from fern/ir-types-v14/definition/environment.yml rename to fern/apis/ir-types-v14/definition/environment.yml diff --git a/fern/ir-types-v14/definition/errors.yml b/fern/apis/ir-types-v14/definition/errors.yml similarity index 100% rename from fern/ir-types-v14/definition/errors.yml rename to fern/apis/ir-types-v14/definition/errors.yml diff --git a/fern/ir-types-v14/definition/http.yml b/fern/apis/ir-types-v14/definition/http.yml similarity index 100% rename from fern/ir-types-v14/definition/http.yml rename to fern/apis/ir-types-v14/definition/http.yml diff --git a/fern/ir-types-v14/definition/ir.yml b/fern/apis/ir-types-v14/definition/ir.yml similarity index 100% rename from fern/ir-types-v14/definition/ir.yml rename to fern/apis/ir-types-v14/definition/ir.yml diff --git a/fern/ir-types-v14/definition/types.yml b/fern/apis/ir-types-v14/definition/types.yml similarity index 100% rename from fern/ir-types-v14/definition/types.yml rename to fern/apis/ir-types-v14/definition/types.yml diff --git a/fern/ir-types-v15/generators.yml b/fern/apis/ir-types-v14/generators.yml similarity index 99% rename from fern/ir-types-v15/generators.yml rename to fern/apis/ir-types-v14/generators.yml index 7a94a54cac7..1107a0e4bcc 100644 --- a/fern/ir-types-v15/generators.yml +++ b/fern/apis/ir-types-v14/generators.yml @@ -13,7 +13,6 @@ groups: config: wrapped-aliases: true enable-forward-compatible-enums: true - - name: fernapi/fern-pydantic-model version: 0.0.34-1-g024c753 config: diff --git a/fern/ir-types-v15/definition/api.yml b/fern/apis/ir-types-v15/definition/api.yml similarity index 100% rename from fern/ir-types-v15/definition/api.yml rename to fern/apis/ir-types-v15/definition/api.yml diff --git a/fern/ir-types-v15/definition/auth.yml b/fern/apis/ir-types-v15/definition/auth.yml similarity index 100% rename from fern/ir-types-v15/definition/auth.yml rename to fern/apis/ir-types-v15/definition/auth.yml diff --git a/fern/ir-types-v15/definition/commons.yml b/fern/apis/ir-types-v15/definition/commons.yml similarity index 100% rename from fern/ir-types-v15/definition/commons.yml rename to fern/apis/ir-types-v15/definition/commons.yml diff --git a/fern/ir-types-v15/definition/constants.yml b/fern/apis/ir-types-v15/definition/constants.yml similarity index 100% rename from fern/ir-types-v15/definition/constants.yml rename to fern/apis/ir-types-v15/definition/constants.yml diff --git a/fern/ir-types-v15/definition/environment.yml b/fern/apis/ir-types-v15/definition/environment.yml similarity index 100% rename from fern/ir-types-v15/definition/environment.yml rename to fern/apis/ir-types-v15/definition/environment.yml diff --git a/fern/ir-types-v15/definition/errors.yml b/fern/apis/ir-types-v15/definition/errors.yml similarity index 100% rename from fern/ir-types-v15/definition/errors.yml rename to fern/apis/ir-types-v15/definition/errors.yml diff --git a/fern/ir-types-v15/definition/http.yml b/fern/apis/ir-types-v15/definition/http.yml similarity index 100% rename from fern/ir-types-v15/definition/http.yml rename to fern/apis/ir-types-v15/definition/http.yml diff --git a/fern/ir-types-v15/definition/ir.yml b/fern/apis/ir-types-v15/definition/ir.yml similarity index 100% rename from fern/ir-types-v15/definition/ir.yml rename to fern/apis/ir-types-v15/definition/ir.yml diff --git a/fern/ir-types-v15/definition/types.yml b/fern/apis/ir-types-v15/definition/types.yml similarity index 100% rename from fern/ir-types-v15/definition/types.yml rename to fern/apis/ir-types-v15/definition/types.yml diff --git a/fern/ir-types-v16/generators.yml b/fern/apis/ir-types-v15/generators.yml similarity index 99% rename from fern/ir-types-v16/generators.yml rename to fern/apis/ir-types-v15/generators.yml index 7a94a54cac7..1107a0e4bcc 100644 --- a/fern/ir-types-v16/generators.yml +++ b/fern/apis/ir-types-v15/generators.yml @@ -13,7 +13,6 @@ groups: config: wrapped-aliases: true enable-forward-compatible-enums: true - - name: fernapi/fern-pydantic-model version: 0.0.34-1-g024c753 config: diff --git a/fern/ir-types-v16/definition/api.yml b/fern/apis/ir-types-v16/definition/api.yml similarity index 100% rename from fern/ir-types-v16/definition/api.yml rename to fern/apis/ir-types-v16/definition/api.yml diff --git a/fern/ir-types-v16/definition/auth.yml b/fern/apis/ir-types-v16/definition/auth.yml similarity index 100% rename from fern/ir-types-v16/definition/auth.yml rename to fern/apis/ir-types-v16/definition/auth.yml diff --git a/fern/ir-types-v16/definition/commons.yml b/fern/apis/ir-types-v16/definition/commons.yml similarity index 100% rename from fern/ir-types-v16/definition/commons.yml rename to fern/apis/ir-types-v16/definition/commons.yml diff --git a/fern/ir-types-v16/definition/constants.yml b/fern/apis/ir-types-v16/definition/constants.yml similarity index 100% rename from fern/ir-types-v16/definition/constants.yml rename to fern/apis/ir-types-v16/definition/constants.yml diff --git a/fern/ir-types-v16/definition/environment.yml b/fern/apis/ir-types-v16/definition/environment.yml similarity index 100% rename from fern/ir-types-v16/definition/environment.yml rename to fern/apis/ir-types-v16/definition/environment.yml diff --git a/fern/ir-types-v16/definition/errors.yml b/fern/apis/ir-types-v16/definition/errors.yml similarity index 100% rename from fern/ir-types-v16/definition/errors.yml rename to fern/apis/ir-types-v16/definition/errors.yml diff --git a/fern/ir-types-v16/definition/http.yml b/fern/apis/ir-types-v16/definition/http.yml similarity index 100% rename from fern/ir-types-v16/definition/http.yml rename to fern/apis/ir-types-v16/definition/http.yml diff --git a/fern/ir-types-v16/definition/ir.yml b/fern/apis/ir-types-v16/definition/ir.yml similarity index 100% rename from fern/ir-types-v16/definition/ir.yml rename to fern/apis/ir-types-v16/definition/ir.yml diff --git a/fern/ir-types-v16/definition/types.yml b/fern/apis/ir-types-v16/definition/types.yml similarity index 100% rename from fern/ir-types-v16/definition/types.yml rename to fern/apis/ir-types-v16/definition/types.yml diff --git a/fern/ir-types-v16/definition/variables.yml b/fern/apis/ir-types-v16/definition/variables.yml similarity index 100% rename from fern/ir-types-v16/definition/variables.yml rename to fern/apis/ir-types-v16/definition/variables.yml diff --git a/fern/ir-types-v13/generators.yml b/fern/apis/ir-types-v16/generators.yml similarity index 99% rename from fern/ir-types-v13/generators.yml rename to fern/apis/ir-types-v16/generators.yml index 7a94a54cac7..1107a0e4bcc 100644 --- a/fern/ir-types-v13/generators.yml +++ b/fern/apis/ir-types-v16/generators.yml @@ -13,7 +13,6 @@ groups: config: wrapped-aliases: true enable-forward-compatible-enums: true - - name: fernapi/fern-pydantic-model version: 0.0.34-1-g024c753 config: diff --git a/fern/ir-types-v17/definition/api.yml b/fern/apis/ir-types-v17/definition/api.yml similarity index 100% rename from fern/ir-types-v17/definition/api.yml rename to fern/apis/ir-types-v17/definition/api.yml diff --git a/fern/ir-types-v17/definition/auth.yml b/fern/apis/ir-types-v17/definition/auth.yml similarity index 100% rename from fern/ir-types-v17/definition/auth.yml rename to fern/apis/ir-types-v17/definition/auth.yml diff --git a/fern/ir-types-v17/definition/commons.yml b/fern/apis/ir-types-v17/definition/commons.yml similarity index 100% rename from fern/ir-types-v17/definition/commons.yml rename to fern/apis/ir-types-v17/definition/commons.yml diff --git a/fern/ir-types-v17/definition/constants.yml b/fern/apis/ir-types-v17/definition/constants.yml similarity index 100% rename from fern/ir-types-v17/definition/constants.yml rename to fern/apis/ir-types-v17/definition/constants.yml diff --git a/fern/ir-types-v17/definition/environment.yml b/fern/apis/ir-types-v17/definition/environment.yml similarity index 100% rename from fern/ir-types-v17/definition/environment.yml rename to fern/apis/ir-types-v17/definition/environment.yml diff --git a/fern/ir-types-v17/definition/errors.yml b/fern/apis/ir-types-v17/definition/errors.yml similarity index 100% rename from fern/ir-types-v17/definition/errors.yml rename to fern/apis/ir-types-v17/definition/errors.yml diff --git a/fern/ir-types-v17/definition/http.yml b/fern/apis/ir-types-v17/definition/http.yml similarity index 100% rename from fern/ir-types-v17/definition/http.yml rename to fern/apis/ir-types-v17/definition/http.yml diff --git a/fern/ir-types-v17/definition/ir.yml b/fern/apis/ir-types-v17/definition/ir.yml similarity index 100% rename from fern/ir-types-v17/definition/ir.yml rename to fern/apis/ir-types-v17/definition/ir.yml diff --git a/fern/ir-types-v17/definition/types.yml b/fern/apis/ir-types-v17/definition/types.yml similarity index 100% rename from fern/ir-types-v17/definition/types.yml rename to fern/apis/ir-types-v17/definition/types.yml diff --git a/fern/ir-types-v17/definition/variables.yml b/fern/apis/ir-types-v17/definition/variables.yml similarity index 100% rename from fern/ir-types-v17/definition/variables.yml rename to fern/apis/ir-types-v17/definition/variables.yml diff --git a/fern/apis/ir-types-v17/generators.yml b/fern/apis/ir-types-v17/generators.yml new file mode 100644 index 00000000000..1107a0e4bcc --- /dev/null +++ b/fern/apis/ir-types-v17/generators.yml @@ -0,0 +1,19 @@ +default-group: local +groups: + local: + generators: + - name: fernapi/fern-typescript + version: 0.0.197 + config: + mode: model + sdks: + generators: + - name: fernapi/java-model + version: 0.3.4 + config: + wrapped-aliases: true + enable-forward-compatible-enums: true + - name: fernapi/fern-pydantic-model + version: 0.0.34-1-g024c753 + config: + wrapped_aliases: true diff --git a/fern/ir-types-v18/definition/api.yml b/fern/apis/ir-types-v18/definition/api.yml similarity index 100% rename from fern/ir-types-v18/definition/api.yml rename to fern/apis/ir-types-v18/definition/api.yml diff --git a/fern/ir-types-v18/definition/auth.yml b/fern/apis/ir-types-v18/definition/auth.yml similarity index 100% rename from fern/ir-types-v18/definition/auth.yml rename to fern/apis/ir-types-v18/definition/auth.yml diff --git a/fern/ir-types-v18/definition/commons.yml b/fern/apis/ir-types-v18/definition/commons.yml similarity index 100% rename from fern/ir-types-v18/definition/commons.yml rename to fern/apis/ir-types-v18/definition/commons.yml diff --git a/fern/ir-types-v18/definition/constants.yml b/fern/apis/ir-types-v18/definition/constants.yml similarity index 100% rename from fern/ir-types-v18/definition/constants.yml rename to fern/apis/ir-types-v18/definition/constants.yml diff --git a/fern/ir-types-v18/definition/environment.yml b/fern/apis/ir-types-v18/definition/environment.yml similarity index 100% rename from fern/ir-types-v18/definition/environment.yml rename to fern/apis/ir-types-v18/definition/environment.yml diff --git a/fern/ir-types-v18/definition/errors.yml b/fern/apis/ir-types-v18/definition/errors.yml similarity index 100% rename from fern/ir-types-v18/definition/errors.yml rename to fern/apis/ir-types-v18/definition/errors.yml diff --git a/fern/ir-types-v18/definition/http.yml b/fern/apis/ir-types-v18/definition/http.yml similarity index 100% rename from fern/ir-types-v18/definition/http.yml rename to fern/apis/ir-types-v18/definition/http.yml diff --git a/fern/ir-types-v18/definition/ir.yml b/fern/apis/ir-types-v18/definition/ir.yml similarity index 100% rename from fern/ir-types-v18/definition/ir.yml rename to fern/apis/ir-types-v18/definition/ir.yml diff --git a/fern/ir-types-v18/definition/types.yml b/fern/apis/ir-types-v18/definition/types.yml similarity index 100% rename from fern/ir-types-v18/definition/types.yml rename to fern/apis/ir-types-v18/definition/types.yml diff --git a/fern/ir-types-v18/definition/variables.yml b/fern/apis/ir-types-v18/definition/variables.yml similarity index 100% rename from fern/ir-types-v18/definition/variables.yml rename to fern/apis/ir-types-v18/definition/variables.yml diff --git a/fern/ir-types-v18/generators.yml b/fern/apis/ir-types-v18/generators.yml similarity index 99% rename from fern/ir-types-v18/generators.yml rename to fern/apis/ir-types-v18/generators.yml index 45fca694b59..2b665737589 100644 --- a/fern/ir-types-v18/generators.yml +++ b/fern/apis/ir-types-v18/generators.yml @@ -13,7 +13,6 @@ groups: config: wrapped-aliases: true enable-forward-compatible-enums: true - - name: fernapi/fern-pydantic-model version: 0.3.4-rc0-4-gc1fa0f2e config: diff --git a/fern/ir-types-v19/definition/api.yml b/fern/apis/ir-types-v19/definition/api.yml similarity index 100% rename from fern/ir-types-v19/definition/api.yml rename to fern/apis/ir-types-v19/definition/api.yml diff --git a/fern/ir-types-v19/definition/auth.yml b/fern/apis/ir-types-v19/definition/auth.yml similarity index 100% rename from fern/ir-types-v19/definition/auth.yml rename to fern/apis/ir-types-v19/definition/auth.yml diff --git a/fern/ir-types-v19/definition/commons.yml b/fern/apis/ir-types-v19/definition/commons.yml similarity index 100% rename from fern/ir-types-v19/definition/commons.yml rename to fern/apis/ir-types-v19/definition/commons.yml diff --git a/fern/ir-types-v19/definition/constants.yml b/fern/apis/ir-types-v19/definition/constants.yml similarity index 100% rename from fern/ir-types-v19/definition/constants.yml rename to fern/apis/ir-types-v19/definition/constants.yml diff --git a/fern/ir-types-v19/definition/environment.yml b/fern/apis/ir-types-v19/definition/environment.yml similarity index 100% rename from fern/ir-types-v19/definition/environment.yml rename to fern/apis/ir-types-v19/definition/environment.yml diff --git a/fern/ir-types-v19/definition/errors.yml b/fern/apis/ir-types-v19/definition/errors.yml similarity index 100% rename from fern/ir-types-v19/definition/errors.yml rename to fern/apis/ir-types-v19/definition/errors.yml diff --git a/fern/ir-types-v19/definition/http.yml b/fern/apis/ir-types-v19/definition/http.yml similarity index 100% rename from fern/ir-types-v19/definition/http.yml rename to fern/apis/ir-types-v19/definition/http.yml diff --git a/fern/ir-types-v19/definition/ir.yml b/fern/apis/ir-types-v19/definition/ir.yml similarity index 100% rename from fern/ir-types-v19/definition/ir.yml rename to fern/apis/ir-types-v19/definition/ir.yml diff --git a/fern/ir-types-v19/definition/types.yml b/fern/apis/ir-types-v19/definition/types.yml similarity index 100% rename from fern/ir-types-v19/definition/types.yml rename to fern/apis/ir-types-v19/definition/types.yml diff --git a/fern/ir-types-v19/definition/variables.yml b/fern/apis/ir-types-v19/definition/variables.yml similarity index 100% rename from fern/ir-types-v19/definition/variables.yml rename to fern/apis/ir-types-v19/definition/variables.yml diff --git a/fern/ir-types-v19/generators.yml b/fern/apis/ir-types-v19/generators.yml similarity index 99% rename from fern/ir-types-v19/generators.yml rename to fern/apis/ir-types-v19/generators.yml index 45fca694b59..2b665737589 100644 --- a/fern/ir-types-v19/generators.yml +++ b/fern/apis/ir-types-v19/generators.yml @@ -13,7 +13,6 @@ groups: config: wrapped-aliases: true enable-forward-compatible-enums: true - - name: fernapi/fern-pydantic-model version: 0.3.4-rc0-4-gc1fa0f2e config: diff --git a/fern/ir-types-v2/definition/api.yml b/fern/apis/ir-types-v2/definition/api.yml similarity index 100% rename from fern/ir-types-v2/definition/api.yml rename to fern/apis/ir-types-v2/definition/api.yml diff --git a/fern/ir-types-v2/definition/auth.yml b/fern/apis/ir-types-v2/definition/auth.yml similarity index 100% rename from fern/ir-types-v2/definition/auth.yml rename to fern/apis/ir-types-v2/definition/auth.yml diff --git a/fern/ir-types-v2/definition/commons.yml b/fern/apis/ir-types-v2/definition/commons.yml similarity index 100% rename from fern/ir-types-v2/definition/commons.yml rename to fern/apis/ir-types-v2/definition/commons.yml diff --git a/fern/ir-types-v2/definition/constants.yml b/fern/apis/ir-types-v2/definition/constants.yml similarity index 100% rename from fern/ir-types-v2/definition/constants.yml rename to fern/apis/ir-types-v2/definition/constants.yml diff --git a/fern/ir-types-v2/definition/declaration.yml b/fern/apis/ir-types-v2/definition/declaration.yml similarity index 100% rename from fern/ir-types-v2/definition/declaration.yml rename to fern/apis/ir-types-v2/definition/declaration.yml diff --git a/fern/ir-types-v2/definition/environment.yml b/fern/apis/ir-types-v2/definition/environment.yml similarity index 100% rename from fern/ir-types-v2/definition/environment.yml rename to fern/apis/ir-types-v2/definition/environment.yml diff --git a/fern/ir-types-v2/definition/errors.yml b/fern/apis/ir-types-v2/definition/errors.yml similarity index 100% rename from fern/ir-types-v2/definition/errors.yml rename to fern/apis/ir-types-v2/definition/errors.yml diff --git a/fern/ir-types-v2/definition/ir.yml b/fern/apis/ir-types-v2/definition/ir.yml similarity index 100% rename from fern/ir-types-v2/definition/ir.yml rename to fern/apis/ir-types-v2/definition/ir.yml diff --git a/fern/ir-types-v2/definition/services/commons.yml b/fern/apis/ir-types-v2/definition/services/commons.yml similarity index 100% rename from fern/ir-types-v2/definition/services/commons.yml rename to fern/apis/ir-types-v2/definition/services/commons.yml diff --git a/fern/ir-types-v2/definition/services/http.yml b/fern/apis/ir-types-v2/definition/services/http.yml similarity index 100% rename from fern/ir-types-v2/definition/services/http.yml rename to fern/apis/ir-types-v2/definition/services/http.yml diff --git a/fern/ir-types-v2/definition/services/websocket.yml b/fern/apis/ir-types-v2/definition/services/websocket.yml similarity index 100% rename from fern/ir-types-v2/definition/services/websocket.yml rename to fern/apis/ir-types-v2/definition/services/websocket.yml diff --git a/fern/ir-types-v2/definition/types.yml b/fern/apis/ir-types-v2/definition/types.yml similarity index 100% rename from fern/ir-types-v2/definition/types.yml rename to fern/apis/ir-types-v2/definition/types.yml diff --git a/fern/ir-types-v3/generators.yml b/fern/apis/ir-types-v2/generators.yml similarity index 92% rename from fern/ir-types-v3/generators.yml rename to fern/apis/ir-types-v2/generators.yml index 87cf5416419..52eebe28285 100644 --- a/fern/ir-types-v3/generators.yml +++ b/fern/apis/ir-types-v2/generators.yml @@ -15,4 +15,4 @@ groups: - name: fernapi/fern-pydantic-model version: 0.0.33-5-g3540939 config: - wrapped_aliases: True + wrapped_aliases: true diff --git a/fern/ir-types-v20/definition/api.yml b/fern/apis/ir-types-v20/definition/api.yml similarity index 100% rename from fern/ir-types-v20/definition/api.yml rename to fern/apis/ir-types-v20/definition/api.yml diff --git a/fern/ir-types-v20/definition/auth.yml b/fern/apis/ir-types-v20/definition/auth.yml similarity index 100% rename from fern/ir-types-v20/definition/auth.yml rename to fern/apis/ir-types-v20/definition/auth.yml diff --git a/fern/ir-types-v20/definition/commons.yml b/fern/apis/ir-types-v20/definition/commons.yml similarity index 100% rename from fern/ir-types-v20/definition/commons.yml rename to fern/apis/ir-types-v20/definition/commons.yml diff --git a/fern/ir-types-v20/definition/constants.yml b/fern/apis/ir-types-v20/definition/constants.yml similarity index 100% rename from fern/ir-types-v20/definition/constants.yml rename to fern/apis/ir-types-v20/definition/constants.yml diff --git a/fern/ir-types-v20/definition/environment.yml b/fern/apis/ir-types-v20/definition/environment.yml similarity index 100% rename from fern/ir-types-v20/definition/environment.yml rename to fern/apis/ir-types-v20/definition/environment.yml diff --git a/fern/ir-types-v20/definition/errors.yml b/fern/apis/ir-types-v20/definition/errors.yml similarity index 100% rename from fern/ir-types-v20/definition/errors.yml rename to fern/apis/ir-types-v20/definition/errors.yml diff --git a/fern/ir-types-v20/definition/http.yml b/fern/apis/ir-types-v20/definition/http.yml similarity index 100% rename from fern/ir-types-v20/definition/http.yml rename to fern/apis/ir-types-v20/definition/http.yml diff --git a/fern/ir-types-v20/definition/ir.yml b/fern/apis/ir-types-v20/definition/ir.yml similarity index 100% rename from fern/ir-types-v20/definition/ir.yml rename to fern/apis/ir-types-v20/definition/ir.yml diff --git a/fern/ir-types-v20/definition/types.yml b/fern/apis/ir-types-v20/definition/types.yml similarity index 100% rename from fern/ir-types-v20/definition/types.yml rename to fern/apis/ir-types-v20/definition/types.yml diff --git a/fern/ir-types-v20/definition/variables.yml b/fern/apis/ir-types-v20/definition/variables.yml similarity index 100% rename from fern/ir-types-v20/definition/variables.yml rename to fern/apis/ir-types-v20/definition/variables.yml diff --git a/fern/ir-types-v20/generators.yml b/fern/apis/ir-types-v20/generators.yml similarity index 99% rename from fern/ir-types-v20/generators.yml rename to fern/apis/ir-types-v20/generators.yml index 8730c1ae9b5..6dbd65352c9 100644 --- a/fern/ir-types-v20/generators.yml +++ b/fern/apis/ir-types-v20/generators.yml @@ -13,7 +13,6 @@ groups: config: wrapped-aliases: true enable-forward-compatible-enums: true - - name: fernapi/fern-pydantic-model version: 0.3.6-rc1-1-ga2f760f4 config: diff --git a/fern/ir-types-v21/definition/api.yml b/fern/apis/ir-types-v21/definition/api.yml similarity index 100% rename from fern/ir-types-v21/definition/api.yml rename to fern/apis/ir-types-v21/definition/api.yml diff --git a/fern/ir-types-v21/definition/auth.yml b/fern/apis/ir-types-v21/definition/auth.yml similarity index 100% rename from fern/ir-types-v21/definition/auth.yml rename to fern/apis/ir-types-v21/definition/auth.yml diff --git a/fern/ir-types-v21/definition/commons.yml b/fern/apis/ir-types-v21/definition/commons.yml similarity index 100% rename from fern/ir-types-v21/definition/commons.yml rename to fern/apis/ir-types-v21/definition/commons.yml diff --git a/fern/ir-types-v21/definition/constants.yml b/fern/apis/ir-types-v21/definition/constants.yml similarity index 100% rename from fern/ir-types-v21/definition/constants.yml rename to fern/apis/ir-types-v21/definition/constants.yml diff --git a/fern/ir-types-v21/definition/environment.yml b/fern/apis/ir-types-v21/definition/environment.yml similarity index 100% rename from fern/ir-types-v21/definition/environment.yml rename to fern/apis/ir-types-v21/definition/environment.yml diff --git a/fern/ir-types-v21/definition/errors.yml b/fern/apis/ir-types-v21/definition/errors.yml similarity index 100% rename from fern/ir-types-v21/definition/errors.yml rename to fern/apis/ir-types-v21/definition/errors.yml diff --git a/fern/ir-types-v21/definition/http.yml b/fern/apis/ir-types-v21/definition/http.yml similarity index 100% rename from fern/ir-types-v21/definition/http.yml rename to fern/apis/ir-types-v21/definition/http.yml diff --git a/fern/ir-types-v21/definition/ir.yml b/fern/apis/ir-types-v21/definition/ir.yml similarity index 100% rename from fern/ir-types-v21/definition/ir.yml rename to fern/apis/ir-types-v21/definition/ir.yml diff --git a/fern/ir-types-v21/definition/types.yml b/fern/apis/ir-types-v21/definition/types.yml similarity index 100% rename from fern/ir-types-v21/definition/types.yml rename to fern/apis/ir-types-v21/definition/types.yml diff --git a/fern/ir-types-v21/definition/variables.yml b/fern/apis/ir-types-v21/definition/variables.yml similarity index 100% rename from fern/ir-types-v21/definition/variables.yml rename to fern/apis/ir-types-v21/definition/variables.yml diff --git a/fern/ir-types-v22/generators.yml b/fern/apis/ir-types-v21/generators.yml similarity index 99% rename from fern/ir-types-v22/generators.yml rename to fern/apis/ir-types-v21/generators.yml index 5b21543483f..1bb229d4e95 100644 --- a/fern/ir-types-v22/generators.yml +++ b/fern/apis/ir-types-v21/generators.yml @@ -12,7 +12,6 @@ groups: version: 0.3.4 config: wrapped-aliases: true - - name: fernapi/fern-pydantic-model version: 0.3.6-rc1-1-ga2f760f4 config: diff --git a/fern/ir-types-v22/definition/api.yml b/fern/apis/ir-types-v22/definition/api.yml similarity index 100% rename from fern/ir-types-v22/definition/api.yml rename to fern/apis/ir-types-v22/definition/api.yml diff --git a/fern/ir-types-v22/definition/auth.yml b/fern/apis/ir-types-v22/definition/auth.yml similarity index 100% rename from fern/ir-types-v22/definition/auth.yml rename to fern/apis/ir-types-v22/definition/auth.yml diff --git a/fern/ir-types-v22/definition/commons.yml b/fern/apis/ir-types-v22/definition/commons.yml similarity index 100% rename from fern/ir-types-v22/definition/commons.yml rename to fern/apis/ir-types-v22/definition/commons.yml diff --git a/fern/ir-types-v22/definition/constants.yml b/fern/apis/ir-types-v22/definition/constants.yml similarity index 100% rename from fern/ir-types-v22/definition/constants.yml rename to fern/apis/ir-types-v22/definition/constants.yml diff --git a/fern/ir-types-v22/definition/environment.yml b/fern/apis/ir-types-v22/definition/environment.yml similarity index 100% rename from fern/ir-types-v22/definition/environment.yml rename to fern/apis/ir-types-v22/definition/environment.yml diff --git a/fern/ir-types-v22/definition/errors.yml b/fern/apis/ir-types-v22/definition/errors.yml similarity index 100% rename from fern/ir-types-v22/definition/errors.yml rename to fern/apis/ir-types-v22/definition/errors.yml diff --git a/fern/ir-types-v22/definition/http.yml b/fern/apis/ir-types-v22/definition/http.yml similarity index 100% rename from fern/ir-types-v22/definition/http.yml rename to fern/apis/ir-types-v22/definition/http.yml diff --git a/fern/ir-types-v22/definition/ir.yml b/fern/apis/ir-types-v22/definition/ir.yml similarity index 100% rename from fern/ir-types-v22/definition/ir.yml rename to fern/apis/ir-types-v22/definition/ir.yml diff --git a/fern/ir-types-v22/definition/types.yml b/fern/apis/ir-types-v22/definition/types.yml similarity index 100% rename from fern/ir-types-v22/definition/types.yml rename to fern/apis/ir-types-v22/definition/types.yml diff --git a/fern/ir-types-v22/definition/variables.yml b/fern/apis/ir-types-v22/definition/variables.yml similarity index 100% rename from fern/ir-types-v22/definition/variables.yml rename to fern/apis/ir-types-v22/definition/variables.yml diff --git a/fern/ir-types-v21/generators.yml b/fern/apis/ir-types-v22/generators.yml similarity index 99% rename from fern/ir-types-v21/generators.yml rename to fern/apis/ir-types-v22/generators.yml index 5b21543483f..1bb229d4e95 100644 --- a/fern/ir-types-v21/generators.yml +++ b/fern/apis/ir-types-v22/generators.yml @@ -12,7 +12,6 @@ groups: version: 0.3.4 config: wrapped-aliases: true - - name: fernapi/fern-pydantic-model version: 0.3.6-rc1-1-ga2f760f4 config: diff --git a/fern/ir-types-v23/definition/api.yml b/fern/apis/ir-types-v23/definition/api.yml similarity index 100% rename from fern/ir-types-v23/definition/api.yml rename to fern/apis/ir-types-v23/definition/api.yml diff --git a/fern/ir-types-v23/definition/auth.yml b/fern/apis/ir-types-v23/definition/auth.yml similarity index 100% rename from fern/ir-types-v23/definition/auth.yml rename to fern/apis/ir-types-v23/definition/auth.yml diff --git a/fern/ir-types-v23/definition/commons.yml b/fern/apis/ir-types-v23/definition/commons.yml similarity index 100% rename from fern/ir-types-v23/definition/commons.yml rename to fern/apis/ir-types-v23/definition/commons.yml diff --git a/fern/ir-types-v23/definition/constants.yml b/fern/apis/ir-types-v23/definition/constants.yml similarity index 100% rename from fern/ir-types-v23/definition/constants.yml rename to fern/apis/ir-types-v23/definition/constants.yml diff --git a/fern/ir-types-v23/definition/environment.yml b/fern/apis/ir-types-v23/definition/environment.yml similarity index 100% rename from fern/ir-types-v23/definition/environment.yml rename to fern/apis/ir-types-v23/definition/environment.yml diff --git a/fern/ir-types-v23/definition/errors.yml b/fern/apis/ir-types-v23/definition/errors.yml similarity index 100% rename from fern/ir-types-v23/definition/errors.yml rename to fern/apis/ir-types-v23/definition/errors.yml diff --git a/fern/ir-types-v23/definition/http.yml b/fern/apis/ir-types-v23/definition/http.yml similarity index 100% rename from fern/ir-types-v23/definition/http.yml rename to fern/apis/ir-types-v23/definition/http.yml diff --git a/fern/ir-types-v23/definition/ir.yml b/fern/apis/ir-types-v23/definition/ir.yml similarity index 100% rename from fern/ir-types-v23/definition/ir.yml rename to fern/apis/ir-types-v23/definition/ir.yml diff --git a/fern/ir-types-v23/definition/types.yml b/fern/apis/ir-types-v23/definition/types.yml similarity index 100% rename from fern/ir-types-v23/definition/types.yml rename to fern/apis/ir-types-v23/definition/types.yml diff --git a/fern/ir-types-v23/definition/variables.yml b/fern/apis/ir-types-v23/definition/variables.yml similarity index 100% rename from fern/ir-types-v23/definition/variables.yml rename to fern/apis/ir-types-v23/definition/variables.yml diff --git a/fern/ir-types-v23/generators.yml b/fern/apis/ir-types-v23/generators.yml similarity index 99% rename from fern/ir-types-v23/generators.yml rename to fern/apis/ir-types-v23/generators.yml index f5de98c035a..c8bfadfd43e 100644 --- a/fern/ir-types-v23/generators.yml +++ b/fern/apis/ir-types-v23/generators.yml @@ -11,14 +11,13 @@ groups: generators: - name: fernapi/java-model version: 0.3.4 - config: - wrapped-aliases: true - enable-forward-compatible-enums: true output: location: maven url: maven.buildwithfern.com coordinate: com.fern.fern:irV23 - + config: + wrapped-aliases: true + enable-forward-compatible-enums: true - name: fernapi/fern-pydantic-model version: 0.3.6-rc1-1-ga2f760f4 config: diff --git a/fern/ir-types-v24/definition/api.yml b/fern/apis/ir-types-v24/definition/api.yml similarity index 100% rename from fern/ir-types-v24/definition/api.yml rename to fern/apis/ir-types-v24/definition/api.yml diff --git a/fern/ir-types-v24/definition/auth.yml b/fern/apis/ir-types-v24/definition/auth.yml similarity index 100% rename from fern/ir-types-v24/definition/auth.yml rename to fern/apis/ir-types-v24/definition/auth.yml diff --git a/fern/ir-types-v24/definition/commons.yml b/fern/apis/ir-types-v24/definition/commons.yml similarity index 100% rename from fern/ir-types-v24/definition/commons.yml rename to fern/apis/ir-types-v24/definition/commons.yml diff --git a/fern/ir-types-v24/definition/constants.yml b/fern/apis/ir-types-v24/definition/constants.yml similarity index 100% rename from fern/ir-types-v24/definition/constants.yml rename to fern/apis/ir-types-v24/definition/constants.yml diff --git a/fern/ir-types-v24/definition/environment.yml b/fern/apis/ir-types-v24/definition/environment.yml similarity index 100% rename from fern/ir-types-v24/definition/environment.yml rename to fern/apis/ir-types-v24/definition/environment.yml diff --git a/fern/ir-types-v24/definition/errors.yml b/fern/apis/ir-types-v24/definition/errors.yml similarity index 100% rename from fern/ir-types-v24/definition/errors.yml rename to fern/apis/ir-types-v24/definition/errors.yml diff --git a/fern/ir-types-v24/definition/http.yml b/fern/apis/ir-types-v24/definition/http.yml similarity index 100% rename from fern/ir-types-v24/definition/http.yml rename to fern/apis/ir-types-v24/definition/http.yml diff --git a/fern/ir-types-v24/definition/ir.yml b/fern/apis/ir-types-v24/definition/ir.yml similarity index 100% rename from fern/ir-types-v24/definition/ir.yml rename to fern/apis/ir-types-v24/definition/ir.yml diff --git a/fern/ir-types-v24/definition/types.yml b/fern/apis/ir-types-v24/definition/types.yml similarity index 100% rename from fern/ir-types-v24/definition/types.yml rename to fern/apis/ir-types-v24/definition/types.yml diff --git a/fern/ir-types-v24/definition/variables.yml b/fern/apis/ir-types-v24/definition/variables.yml similarity index 100% rename from fern/ir-types-v24/definition/variables.yml rename to fern/apis/ir-types-v24/definition/variables.yml diff --git a/fern/ir-types-v24/definition/webhooks.yml b/fern/apis/ir-types-v24/definition/webhooks.yml similarity index 100% rename from fern/ir-types-v24/definition/webhooks.yml rename to fern/apis/ir-types-v24/definition/webhooks.yml diff --git a/fern/ir-types-v24/generators.yml b/fern/apis/ir-types-v24/generators.yml similarity index 99% rename from fern/ir-types-v24/generators.yml rename to fern/apis/ir-types-v24/generators.yml index d59863d9dd3..17538c1b4bb 100644 --- a/fern/ir-types-v24/generators.yml +++ b/fern/apis/ir-types-v24/generators.yml @@ -11,14 +11,13 @@ groups: generators: - name: fernapi/java-model version: 0.3.4 - config: - wrapped-aliases: true - enable-forward-compatible-enums: true output: location: maven url: maven.buildwithfern.com coordinate: com.fern.fern:irV24 - + config: + wrapped-aliases: true + enable-forward-compatible-enums: true - name: fernapi/fern-pydantic-model version: 0.3.6-rc1-1-ga2f760f4 config: diff --git a/fern/ir-types-v25/definition/api.yml b/fern/apis/ir-types-v25/definition/api.yml similarity index 100% rename from fern/ir-types-v25/definition/api.yml rename to fern/apis/ir-types-v25/definition/api.yml diff --git a/fern/ir-types-v25/definition/auth.yml b/fern/apis/ir-types-v25/definition/auth.yml similarity index 100% rename from fern/ir-types-v25/definition/auth.yml rename to fern/apis/ir-types-v25/definition/auth.yml diff --git a/fern/ir-types-v25/definition/commons.yml b/fern/apis/ir-types-v25/definition/commons.yml similarity index 100% rename from fern/ir-types-v25/definition/commons.yml rename to fern/apis/ir-types-v25/definition/commons.yml diff --git a/fern/ir-types-v25/definition/constants.yml b/fern/apis/ir-types-v25/definition/constants.yml similarity index 100% rename from fern/ir-types-v25/definition/constants.yml rename to fern/apis/ir-types-v25/definition/constants.yml diff --git a/fern/ir-types-v25/definition/environment.yml b/fern/apis/ir-types-v25/definition/environment.yml similarity index 100% rename from fern/ir-types-v25/definition/environment.yml rename to fern/apis/ir-types-v25/definition/environment.yml diff --git a/fern/ir-types-v25/definition/errors.yml b/fern/apis/ir-types-v25/definition/errors.yml similarity index 100% rename from fern/ir-types-v25/definition/errors.yml rename to fern/apis/ir-types-v25/definition/errors.yml diff --git a/fern/ir-types-v25/definition/http.yml b/fern/apis/ir-types-v25/definition/http.yml similarity index 100% rename from fern/ir-types-v25/definition/http.yml rename to fern/apis/ir-types-v25/definition/http.yml diff --git a/fern/ir-types-v25/definition/ir.yml b/fern/apis/ir-types-v25/definition/ir.yml similarity index 100% rename from fern/ir-types-v25/definition/ir.yml rename to fern/apis/ir-types-v25/definition/ir.yml diff --git a/fern/ir-types-v25/definition/types.yml b/fern/apis/ir-types-v25/definition/types.yml similarity index 100% rename from fern/ir-types-v25/definition/types.yml rename to fern/apis/ir-types-v25/definition/types.yml diff --git a/fern/ir-types-v25/definition/variables.yml b/fern/apis/ir-types-v25/definition/variables.yml similarity index 100% rename from fern/ir-types-v25/definition/variables.yml rename to fern/apis/ir-types-v25/definition/variables.yml diff --git a/fern/ir-types-v25/definition/webhooks.yml b/fern/apis/ir-types-v25/definition/webhooks.yml similarity index 100% rename from fern/ir-types-v25/definition/webhooks.yml rename to fern/apis/ir-types-v25/definition/webhooks.yml diff --git a/fern/ir-types-v25/generators.yml b/fern/apis/ir-types-v25/generators.yml similarity index 99% rename from fern/ir-types-v25/generators.yml rename to fern/apis/ir-types-v25/generators.yml index 37946cf2f13..0c0a90cb52e 100644 --- a/fern/ir-types-v25/generators.yml +++ b/fern/apis/ir-types-v25/generators.yml @@ -11,14 +11,13 @@ groups: generators: - name: fernapi/java-model version: 0.3.4 - config: - wrapped-aliases: true - enable-forward-compatible-enums: true output: location: maven url: maven.buildwithfern.com coordinate: com.fern.fern:irV25 - + config: + wrapped-aliases: true + enable-forward-compatible-enums: true - name: fernapi/fern-pydantic-model version: 0.3.6-rc1-1-ga2f760f4 config: diff --git a/fern/ir-types-v26/definition/api.yml b/fern/apis/ir-types-v26/definition/api.yml similarity index 100% rename from fern/ir-types-v26/definition/api.yml rename to fern/apis/ir-types-v26/definition/api.yml diff --git a/fern/ir-types-v26/definition/auth.yml b/fern/apis/ir-types-v26/definition/auth.yml similarity index 100% rename from fern/ir-types-v26/definition/auth.yml rename to fern/apis/ir-types-v26/definition/auth.yml diff --git a/fern/ir-types-v26/definition/commons.yml b/fern/apis/ir-types-v26/definition/commons.yml similarity index 100% rename from fern/ir-types-v26/definition/commons.yml rename to fern/apis/ir-types-v26/definition/commons.yml diff --git a/fern/ir-types-v26/definition/constants.yml b/fern/apis/ir-types-v26/definition/constants.yml similarity index 100% rename from fern/ir-types-v26/definition/constants.yml rename to fern/apis/ir-types-v26/definition/constants.yml diff --git a/fern/ir-types-v26/definition/environment.yml b/fern/apis/ir-types-v26/definition/environment.yml similarity index 100% rename from fern/ir-types-v26/definition/environment.yml rename to fern/apis/ir-types-v26/definition/environment.yml diff --git a/fern/ir-types-v26/definition/errors.yml b/fern/apis/ir-types-v26/definition/errors.yml similarity index 100% rename from fern/ir-types-v26/definition/errors.yml rename to fern/apis/ir-types-v26/definition/errors.yml diff --git a/fern/ir-types-v26/definition/http.yml b/fern/apis/ir-types-v26/definition/http.yml similarity index 100% rename from fern/ir-types-v26/definition/http.yml rename to fern/apis/ir-types-v26/definition/http.yml diff --git a/fern/ir-types-v26/definition/ir.yml b/fern/apis/ir-types-v26/definition/ir.yml similarity index 100% rename from fern/ir-types-v26/definition/ir.yml rename to fern/apis/ir-types-v26/definition/ir.yml diff --git a/fern/ir-types-v26/definition/types.yml b/fern/apis/ir-types-v26/definition/types.yml similarity index 100% rename from fern/ir-types-v26/definition/types.yml rename to fern/apis/ir-types-v26/definition/types.yml diff --git a/fern/ir-types-v26/definition/variables.yml b/fern/apis/ir-types-v26/definition/variables.yml similarity index 100% rename from fern/ir-types-v26/definition/variables.yml rename to fern/apis/ir-types-v26/definition/variables.yml diff --git a/fern/ir-types-v26/definition/webhooks.yml b/fern/apis/ir-types-v26/definition/webhooks.yml similarity index 100% rename from fern/ir-types-v26/definition/webhooks.yml rename to fern/apis/ir-types-v26/definition/webhooks.yml diff --git a/fern/ir-types-v26/generators.yml b/fern/apis/ir-types-v26/generators.yml similarity index 99% rename from fern/ir-types-v26/generators.yml rename to fern/apis/ir-types-v26/generators.yml index b63cb8c9213..c00ffb4a8fb 100644 --- a/fern/ir-types-v26/generators.yml +++ b/fern/apis/ir-types-v26/generators.yml @@ -11,14 +11,13 @@ groups: generators: - name: fernapi/java-model version: 0.3.4 - config: - wrapped-aliases: true - enable-forward-compatible-enums: true output: location: maven url: maven.buildwithfern.com coordinate: com.fern.fern:irV26 - + config: + wrapped-aliases: true + enable-forward-compatible-enums: true - name: fernapi/fern-pydantic-model version: 0.3.6-rc1-1-ga2f760f4 config: diff --git a/fern/ir-types-v27/definition/api.yml b/fern/apis/ir-types-v27/definition/api.yml similarity index 100% rename from fern/ir-types-v27/definition/api.yml rename to fern/apis/ir-types-v27/definition/api.yml diff --git a/fern/ir-types-v27/definition/auth.yml b/fern/apis/ir-types-v27/definition/auth.yml similarity index 100% rename from fern/ir-types-v27/definition/auth.yml rename to fern/apis/ir-types-v27/definition/auth.yml diff --git a/fern/ir-types-v27/definition/commons.yml b/fern/apis/ir-types-v27/definition/commons.yml similarity index 100% rename from fern/ir-types-v27/definition/commons.yml rename to fern/apis/ir-types-v27/definition/commons.yml diff --git a/fern/ir-types-v27/definition/constants.yml b/fern/apis/ir-types-v27/definition/constants.yml similarity index 100% rename from fern/ir-types-v27/definition/constants.yml rename to fern/apis/ir-types-v27/definition/constants.yml diff --git a/fern/ir-types-v27/definition/environment.yml b/fern/apis/ir-types-v27/definition/environment.yml similarity index 100% rename from fern/ir-types-v27/definition/environment.yml rename to fern/apis/ir-types-v27/definition/environment.yml diff --git a/fern/ir-types-v27/definition/errors.yml b/fern/apis/ir-types-v27/definition/errors.yml similarity index 100% rename from fern/ir-types-v27/definition/errors.yml rename to fern/apis/ir-types-v27/definition/errors.yml diff --git a/fern/ir-types-v27/definition/http.yml b/fern/apis/ir-types-v27/definition/http.yml similarity index 100% rename from fern/ir-types-v27/definition/http.yml rename to fern/apis/ir-types-v27/definition/http.yml diff --git a/fern/ir-types-v27/definition/ir.yml b/fern/apis/ir-types-v27/definition/ir.yml similarity index 100% rename from fern/ir-types-v27/definition/ir.yml rename to fern/apis/ir-types-v27/definition/ir.yml diff --git a/fern/ir-types-v27/definition/types.yml b/fern/apis/ir-types-v27/definition/types.yml similarity index 100% rename from fern/ir-types-v27/definition/types.yml rename to fern/apis/ir-types-v27/definition/types.yml diff --git a/fern/ir-types-v27/definition/variables.yml b/fern/apis/ir-types-v27/definition/variables.yml similarity index 100% rename from fern/ir-types-v27/definition/variables.yml rename to fern/apis/ir-types-v27/definition/variables.yml diff --git a/fern/ir-types-v27/definition/webhooks.yml b/fern/apis/ir-types-v27/definition/webhooks.yml similarity index 100% rename from fern/ir-types-v27/definition/webhooks.yml rename to fern/apis/ir-types-v27/definition/webhooks.yml diff --git a/fern/ir-types-v27/generators.yml b/fern/apis/ir-types-v27/generators.yml similarity index 99% rename from fern/ir-types-v27/generators.yml rename to fern/apis/ir-types-v27/generators.yml index 1d109aad382..7fe72e9a953 100644 --- a/fern/ir-types-v27/generators.yml +++ b/fern/apis/ir-types-v27/generators.yml @@ -11,14 +11,13 @@ groups: generators: - name: fernapi/java-model version: 0.3.4 - config: - wrapped-aliases: true - enable-forward-compatible-enums: true output: location: maven url: maven.buildwithfern.com coordinate: com.fern.fern:irV27 - + config: + wrapped-aliases: true + enable-forward-compatible-enums: true - name: fernapi/fern-pydantic-model version: 0.3.6-rc1-1-ga2f760f4 config: diff --git a/fern/ir-types-v28/definition/api.yml b/fern/apis/ir-types-v28/definition/api.yml similarity index 100% rename from fern/ir-types-v28/definition/api.yml rename to fern/apis/ir-types-v28/definition/api.yml diff --git a/fern/ir-types-v28/definition/auth.yml b/fern/apis/ir-types-v28/definition/auth.yml similarity index 100% rename from fern/ir-types-v28/definition/auth.yml rename to fern/apis/ir-types-v28/definition/auth.yml diff --git a/fern/ir-types-v28/definition/commons.yml b/fern/apis/ir-types-v28/definition/commons.yml similarity index 100% rename from fern/ir-types-v28/definition/commons.yml rename to fern/apis/ir-types-v28/definition/commons.yml diff --git a/fern/ir-types-v28/definition/constants.yml b/fern/apis/ir-types-v28/definition/constants.yml similarity index 100% rename from fern/ir-types-v28/definition/constants.yml rename to fern/apis/ir-types-v28/definition/constants.yml diff --git a/fern/ir-types-v28/definition/environment.yml b/fern/apis/ir-types-v28/definition/environment.yml similarity index 100% rename from fern/ir-types-v28/definition/environment.yml rename to fern/apis/ir-types-v28/definition/environment.yml diff --git a/fern/ir-types-v28/definition/errors.yml b/fern/apis/ir-types-v28/definition/errors.yml similarity index 100% rename from fern/ir-types-v28/definition/errors.yml rename to fern/apis/ir-types-v28/definition/errors.yml diff --git a/fern/ir-types-v28/definition/http.yml b/fern/apis/ir-types-v28/definition/http.yml similarity index 100% rename from fern/ir-types-v28/definition/http.yml rename to fern/apis/ir-types-v28/definition/http.yml diff --git a/fern/ir-types-v28/definition/ir.yml b/fern/apis/ir-types-v28/definition/ir.yml similarity index 100% rename from fern/ir-types-v28/definition/ir.yml rename to fern/apis/ir-types-v28/definition/ir.yml diff --git a/fern/ir-types-v28/definition/types.yml b/fern/apis/ir-types-v28/definition/types.yml similarity index 100% rename from fern/ir-types-v28/definition/types.yml rename to fern/apis/ir-types-v28/definition/types.yml diff --git a/fern/ir-types-v28/definition/variables.yml b/fern/apis/ir-types-v28/definition/variables.yml similarity index 100% rename from fern/ir-types-v28/definition/variables.yml rename to fern/apis/ir-types-v28/definition/variables.yml diff --git a/fern/ir-types-v28/definition/webhooks.yml b/fern/apis/ir-types-v28/definition/webhooks.yml similarity index 100% rename from fern/ir-types-v28/definition/webhooks.yml rename to fern/apis/ir-types-v28/definition/webhooks.yml diff --git a/fern/ir-types-v28/generators.yml b/fern/apis/ir-types-v28/generators.yml similarity index 99% rename from fern/ir-types-v28/generators.yml rename to fern/apis/ir-types-v28/generators.yml index 7f2a0e7d215..3484862ebb1 100644 --- a/fern/ir-types-v28/generators.yml +++ b/fern/apis/ir-types-v28/generators.yml @@ -11,14 +11,13 @@ groups: generators: - name: fernapi/java-model version: 0.3.4 - config: - wrapped-aliases: true - enable-forward-compatible-enums: true output: location: maven url: maven.buildwithfern.com coordinate: com.fern.fern:irV28 - + config: + wrapped-aliases: true + enable-forward-compatible-enums: true - name: fernapi/fern-pydantic-model version: 0.3.6-rc1-1-ga2f760f4 config: diff --git a/fern/ir-types-v29/definition/api.yml b/fern/apis/ir-types-v29/definition/api.yml similarity index 100% rename from fern/ir-types-v29/definition/api.yml rename to fern/apis/ir-types-v29/definition/api.yml diff --git a/fern/ir-types-v29/definition/auth.yml b/fern/apis/ir-types-v29/definition/auth.yml similarity index 100% rename from fern/ir-types-v29/definition/auth.yml rename to fern/apis/ir-types-v29/definition/auth.yml diff --git a/fern/ir-types-v29/definition/commons.yml b/fern/apis/ir-types-v29/definition/commons.yml similarity index 100% rename from fern/ir-types-v29/definition/commons.yml rename to fern/apis/ir-types-v29/definition/commons.yml diff --git a/fern/ir-types-v29/definition/constants.yml b/fern/apis/ir-types-v29/definition/constants.yml similarity index 100% rename from fern/ir-types-v29/definition/constants.yml rename to fern/apis/ir-types-v29/definition/constants.yml diff --git a/fern/ir-types-v29/definition/environment.yml b/fern/apis/ir-types-v29/definition/environment.yml similarity index 100% rename from fern/ir-types-v29/definition/environment.yml rename to fern/apis/ir-types-v29/definition/environment.yml diff --git a/fern/ir-types-v29/definition/errors.yml b/fern/apis/ir-types-v29/definition/errors.yml similarity index 100% rename from fern/ir-types-v29/definition/errors.yml rename to fern/apis/ir-types-v29/definition/errors.yml diff --git a/fern/ir-types-v29/definition/http.yml b/fern/apis/ir-types-v29/definition/http.yml similarity index 100% rename from fern/ir-types-v29/definition/http.yml rename to fern/apis/ir-types-v29/definition/http.yml diff --git a/fern/ir-types-v29/definition/ir.yml b/fern/apis/ir-types-v29/definition/ir.yml similarity index 100% rename from fern/ir-types-v29/definition/ir.yml rename to fern/apis/ir-types-v29/definition/ir.yml diff --git a/fern/ir-types-v29/definition/types.yml b/fern/apis/ir-types-v29/definition/types.yml similarity index 100% rename from fern/ir-types-v29/definition/types.yml rename to fern/apis/ir-types-v29/definition/types.yml diff --git a/fern/ir-types-v29/definition/variables.yml b/fern/apis/ir-types-v29/definition/variables.yml similarity index 100% rename from fern/ir-types-v29/definition/variables.yml rename to fern/apis/ir-types-v29/definition/variables.yml diff --git a/fern/ir-types-v29/definition/webhooks.yml b/fern/apis/ir-types-v29/definition/webhooks.yml similarity index 100% rename from fern/ir-types-v29/definition/webhooks.yml rename to fern/apis/ir-types-v29/definition/webhooks.yml diff --git a/fern/ir-types-v29/generators.yml b/fern/apis/ir-types-v29/generators.yml similarity index 99% rename from fern/ir-types-v29/generators.yml rename to fern/apis/ir-types-v29/generators.yml index 247d4ed1a1b..1c8b32ab890 100644 --- a/fern/ir-types-v29/generators.yml +++ b/fern/apis/ir-types-v29/generators.yml @@ -11,14 +11,13 @@ groups: generators: - name: fernapi/java-model version: 0.3.4 - config: - wrapped-aliases: true - enable-forward-compatible-enums: true output: location: maven url: maven.buildwithfern.com coordinate: com.fern.fern:irV29 - + config: + wrapped-aliases: true + enable-forward-compatible-enums: true - name: fernapi/fern-pydantic-model version: 0.3.6-rc1-1-ga2f760f4 config: diff --git a/fern/ir-types-v3/definition/api.yml b/fern/apis/ir-types-v3/definition/api.yml similarity index 100% rename from fern/ir-types-v3/definition/api.yml rename to fern/apis/ir-types-v3/definition/api.yml diff --git a/fern/ir-types-v3/definition/auth.yml b/fern/apis/ir-types-v3/definition/auth.yml similarity index 100% rename from fern/ir-types-v3/definition/auth.yml rename to fern/apis/ir-types-v3/definition/auth.yml diff --git a/fern/ir-types-v3/definition/commons.yml b/fern/apis/ir-types-v3/definition/commons.yml similarity index 100% rename from fern/ir-types-v3/definition/commons.yml rename to fern/apis/ir-types-v3/definition/commons.yml diff --git a/fern/ir-types-v3/definition/constants.yml b/fern/apis/ir-types-v3/definition/constants.yml similarity index 100% rename from fern/ir-types-v3/definition/constants.yml rename to fern/apis/ir-types-v3/definition/constants.yml diff --git a/fern/ir-types-v3/definition/declaration.yml b/fern/apis/ir-types-v3/definition/declaration.yml similarity index 100% rename from fern/ir-types-v3/definition/declaration.yml rename to fern/apis/ir-types-v3/definition/declaration.yml diff --git a/fern/ir-types-v3/definition/environment.yml b/fern/apis/ir-types-v3/definition/environment.yml similarity index 100% rename from fern/ir-types-v3/definition/environment.yml rename to fern/apis/ir-types-v3/definition/environment.yml diff --git a/fern/ir-types-v3/definition/errors.yml b/fern/apis/ir-types-v3/definition/errors.yml similarity index 100% rename from fern/ir-types-v3/definition/errors.yml rename to fern/apis/ir-types-v3/definition/errors.yml diff --git a/fern/ir-types-v3/definition/ir.yml b/fern/apis/ir-types-v3/definition/ir.yml similarity index 100% rename from fern/ir-types-v3/definition/ir.yml rename to fern/apis/ir-types-v3/definition/ir.yml diff --git a/fern/ir-types-v3/definition/services/commons.yml b/fern/apis/ir-types-v3/definition/services/commons.yml similarity index 100% rename from fern/ir-types-v3/definition/services/commons.yml rename to fern/apis/ir-types-v3/definition/services/commons.yml diff --git a/fern/ir-types-v3/definition/services/http.yml b/fern/apis/ir-types-v3/definition/services/http.yml similarity index 100% rename from fern/ir-types-v3/definition/services/http.yml rename to fern/apis/ir-types-v3/definition/services/http.yml diff --git a/fern/ir-types-v3/definition/services/websocket.yml b/fern/apis/ir-types-v3/definition/services/websocket.yml similarity index 100% rename from fern/ir-types-v3/definition/services/websocket.yml rename to fern/apis/ir-types-v3/definition/services/websocket.yml diff --git a/fern/ir-types-v3/definition/types.yml b/fern/apis/ir-types-v3/definition/types.yml similarity index 100% rename from fern/ir-types-v3/definition/types.yml rename to fern/apis/ir-types-v3/definition/types.yml diff --git a/fern/ir-types-v4/generators.yml b/fern/apis/ir-types-v3/generators.yml similarity index 92% rename from fern/ir-types-v4/generators.yml rename to fern/apis/ir-types-v3/generators.yml index 87cf5416419..52eebe28285 100644 --- a/fern/ir-types-v4/generators.yml +++ b/fern/apis/ir-types-v3/generators.yml @@ -15,4 +15,4 @@ groups: - name: fernapi/fern-pydantic-model version: 0.0.33-5-g3540939 config: - wrapped_aliases: True + wrapped_aliases: true diff --git a/fern/ir-types-v30/definition/api.yml b/fern/apis/ir-types-v30/definition/api.yml similarity index 100% rename from fern/ir-types-v30/definition/api.yml rename to fern/apis/ir-types-v30/definition/api.yml diff --git a/fern/ir-types-v30/definition/auth.yml b/fern/apis/ir-types-v30/definition/auth.yml similarity index 100% rename from fern/ir-types-v30/definition/auth.yml rename to fern/apis/ir-types-v30/definition/auth.yml diff --git a/fern/ir-types-v30/definition/commons.yml b/fern/apis/ir-types-v30/definition/commons.yml similarity index 100% rename from fern/ir-types-v30/definition/commons.yml rename to fern/apis/ir-types-v30/definition/commons.yml diff --git a/fern/ir-types-v30/definition/constants.yml b/fern/apis/ir-types-v30/definition/constants.yml similarity index 100% rename from fern/ir-types-v30/definition/constants.yml rename to fern/apis/ir-types-v30/definition/constants.yml diff --git a/fern/ir-types-v30/definition/environment.yml b/fern/apis/ir-types-v30/definition/environment.yml similarity index 100% rename from fern/ir-types-v30/definition/environment.yml rename to fern/apis/ir-types-v30/definition/environment.yml diff --git a/fern/ir-types-v30/definition/errors.yml b/fern/apis/ir-types-v30/definition/errors.yml similarity index 100% rename from fern/ir-types-v30/definition/errors.yml rename to fern/apis/ir-types-v30/definition/errors.yml diff --git a/fern/ir-types-v30/definition/http.yml b/fern/apis/ir-types-v30/definition/http.yml similarity index 100% rename from fern/ir-types-v30/definition/http.yml rename to fern/apis/ir-types-v30/definition/http.yml diff --git a/fern/ir-types-v30/definition/ir.yml b/fern/apis/ir-types-v30/definition/ir.yml similarity index 100% rename from fern/ir-types-v30/definition/ir.yml rename to fern/apis/ir-types-v30/definition/ir.yml diff --git a/fern/ir-types-v30/definition/types.yml b/fern/apis/ir-types-v30/definition/types.yml similarity index 100% rename from fern/ir-types-v30/definition/types.yml rename to fern/apis/ir-types-v30/definition/types.yml diff --git a/fern/ir-types-v30/definition/variables.yml b/fern/apis/ir-types-v30/definition/variables.yml similarity index 100% rename from fern/ir-types-v30/definition/variables.yml rename to fern/apis/ir-types-v30/definition/variables.yml diff --git a/fern/ir-types-v30/definition/webhooks.yml b/fern/apis/ir-types-v30/definition/webhooks.yml similarity index 100% rename from fern/ir-types-v30/definition/webhooks.yml rename to fern/apis/ir-types-v30/definition/webhooks.yml diff --git a/fern/ir-types-v30/generators.yml b/fern/apis/ir-types-v30/generators.yml similarity index 99% rename from fern/ir-types-v30/generators.yml rename to fern/apis/ir-types-v30/generators.yml index e94ddd9fe2a..51745a60eba 100644 --- a/fern/ir-types-v30/generators.yml +++ b/fern/apis/ir-types-v30/generators.yml @@ -11,21 +11,19 @@ groups: generators: - name: fernapi/java-model version: 0.3.4 - config: - wrapped-aliases: true - enable-forward-compatible-enums: true output: location: maven url: maven.buildwithfern.com coordinate: com.fern.fern:irV30 - + config: + wrapped-aliases: true + enable-forward-compatible-enums: true - name: fernapi/fern-pydantic-model version: 0.3.6-rc1-1-ga2f760f4 config: wrapped_aliases: true include_union_utils: true frozen: true - - name: fernapi/fern-go-model version: 0.9.0 github: diff --git a/fern/ir-types-v31/definition/api.yml b/fern/apis/ir-types-v31/definition/api.yml similarity index 100% rename from fern/ir-types-v31/definition/api.yml rename to fern/apis/ir-types-v31/definition/api.yml diff --git a/fern/ir-types-v31/definition/auth.yml b/fern/apis/ir-types-v31/definition/auth.yml similarity index 100% rename from fern/ir-types-v31/definition/auth.yml rename to fern/apis/ir-types-v31/definition/auth.yml diff --git a/fern/ir-types-v31/definition/commons.yml b/fern/apis/ir-types-v31/definition/commons.yml similarity index 100% rename from fern/ir-types-v31/definition/commons.yml rename to fern/apis/ir-types-v31/definition/commons.yml diff --git a/fern/ir-types-v31/definition/constants.yml b/fern/apis/ir-types-v31/definition/constants.yml similarity index 100% rename from fern/ir-types-v31/definition/constants.yml rename to fern/apis/ir-types-v31/definition/constants.yml diff --git a/fern/ir-types-v31/definition/environment.yml b/fern/apis/ir-types-v31/definition/environment.yml similarity index 100% rename from fern/ir-types-v31/definition/environment.yml rename to fern/apis/ir-types-v31/definition/environment.yml diff --git a/fern/ir-types-v31/definition/errors.yml b/fern/apis/ir-types-v31/definition/errors.yml similarity index 100% rename from fern/ir-types-v31/definition/errors.yml rename to fern/apis/ir-types-v31/definition/errors.yml diff --git a/fern/ir-types-v31/definition/http.yml b/fern/apis/ir-types-v31/definition/http.yml similarity index 100% rename from fern/ir-types-v31/definition/http.yml rename to fern/apis/ir-types-v31/definition/http.yml diff --git a/fern/ir-types-v31/definition/ir.yml b/fern/apis/ir-types-v31/definition/ir.yml similarity index 100% rename from fern/ir-types-v31/definition/ir.yml rename to fern/apis/ir-types-v31/definition/ir.yml diff --git a/fern/ir-types-v31/definition/types.yml b/fern/apis/ir-types-v31/definition/types.yml similarity index 100% rename from fern/ir-types-v31/definition/types.yml rename to fern/apis/ir-types-v31/definition/types.yml diff --git a/fern/ir-types-v31/definition/variables.yml b/fern/apis/ir-types-v31/definition/variables.yml similarity index 100% rename from fern/ir-types-v31/definition/variables.yml rename to fern/apis/ir-types-v31/definition/variables.yml diff --git a/fern/ir-types-v31/definition/webhooks.yml b/fern/apis/ir-types-v31/definition/webhooks.yml similarity index 100% rename from fern/ir-types-v31/definition/webhooks.yml rename to fern/apis/ir-types-v31/definition/webhooks.yml diff --git a/fern/ir-types-v31/generators.yml b/fern/apis/ir-types-v31/generators.yml similarity index 95% rename from fern/ir-types-v31/generators.yml rename to fern/apis/ir-types-v31/generators.yml index 4d762a7a12f..f7be60faaac 100644 --- a/fern/ir-types-v31/generators.yml +++ b/fern/apis/ir-types-v31/generators.yml @@ -4,36 +4,34 @@ groups: generators: - name: fernapi/fern-typescript-node-sdk version: 0.7.4-rc3-3-gd2356023 - config: - includeUtilsOnUnionMembers: true - noOptionalProperties: true output: location: npm url: npm.buildwithfern.com - package-name: "@fern-fern/ir-sdk" + package-name: '@fern-fern/ir-sdk' + config: + includeUtilsOnUnionMembers: true + noOptionalProperties: true sdks: generators: - name: fernapi/java-model version: 0.3.4 - config: - wrapped-aliases: true - enable-forward-compatible-enums: true output: location: maven url: maven.buildwithfern.com coordinate: com.fern.fern:irV31 - + config: + wrapped-aliases: true + enable-forward-compatible-enums: true - name: fernapi/fern-pydantic-model version: 0.3.6-rc1-1-ga2f760f4 - config: - wrapped_aliases: true - include_union_utils: true - frozen: true output: location: pypi url: pypi.buildwithfern.com package-name: fern_fern_ir_v31 - + config: + wrapped_aliases: true + include_union_utils: true + frozen: true - name: fernapi/fern-go-model version: 0.9.0 github: diff --git a/fern/ir-types-v4/definition/api.yml b/fern/apis/ir-types-v4/definition/api.yml similarity index 100% rename from fern/ir-types-v4/definition/api.yml rename to fern/apis/ir-types-v4/definition/api.yml diff --git a/fern/ir-types-v4/definition/auth.yml b/fern/apis/ir-types-v4/definition/auth.yml similarity index 100% rename from fern/ir-types-v4/definition/auth.yml rename to fern/apis/ir-types-v4/definition/auth.yml diff --git a/fern/ir-types-v4/definition/commons.yml b/fern/apis/ir-types-v4/definition/commons.yml similarity index 100% rename from fern/ir-types-v4/definition/commons.yml rename to fern/apis/ir-types-v4/definition/commons.yml diff --git a/fern/ir-types-v4/definition/constants.yml b/fern/apis/ir-types-v4/definition/constants.yml similarity index 100% rename from fern/ir-types-v4/definition/constants.yml rename to fern/apis/ir-types-v4/definition/constants.yml diff --git a/fern/ir-types-v4/definition/declaration.yml b/fern/apis/ir-types-v4/definition/declaration.yml similarity index 100% rename from fern/ir-types-v4/definition/declaration.yml rename to fern/apis/ir-types-v4/definition/declaration.yml diff --git a/fern/ir-types-v4/definition/environment.yml b/fern/apis/ir-types-v4/definition/environment.yml similarity index 100% rename from fern/ir-types-v4/definition/environment.yml rename to fern/apis/ir-types-v4/definition/environment.yml diff --git a/fern/ir-types-v4/definition/errors.yml b/fern/apis/ir-types-v4/definition/errors.yml similarity index 100% rename from fern/ir-types-v4/definition/errors.yml rename to fern/apis/ir-types-v4/definition/errors.yml diff --git a/fern/ir-types-v4/definition/ir.yml b/fern/apis/ir-types-v4/definition/ir.yml similarity index 100% rename from fern/ir-types-v4/definition/ir.yml rename to fern/apis/ir-types-v4/definition/ir.yml diff --git a/fern/ir-types-v4/definition/services/commons.yml b/fern/apis/ir-types-v4/definition/services/commons.yml similarity index 100% rename from fern/ir-types-v4/definition/services/commons.yml rename to fern/apis/ir-types-v4/definition/services/commons.yml diff --git a/fern/ir-types-v4/definition/services/http.yml b/fern/apis/ir-types-v4/definition/services/http.yml similarity index 100% rename from fern/ir-types-v4/definition/services/http.yml rename to fern/apis/ir-types-v4/definition/services/http.yml diff --git a/fern/ir-types-v4/definition/services/websocket.yml b/fern/apis/ir-types-v4/definition/services/websocket.yml similarity index 100% rename from fern/ir-types-v4/definition/services/websocket.yml rename to fern/apis/ir-types-v4/definition/services/websocket.yml diff --git a/fern/ir-types-v4/definition/types.yml b/fern/apis/ir-types-v4/definition/types.yml similarity index 100% rename from fern/ir-types-v4/definition/types.yml rename to fern/apis/ir-types-v4/definition/types.yml diff --git a/fern/ir-types-v2/generators.yml b/fern/apis/ir-types-v4/generators.yml similarity index 92% rename from fern/ir-types-v2/generators.yml rename to fern/apis/ir-types-v4/generators.yml index 87cf5416419..52eebe28285 100644 --- a/fern/ir-types-v2/generators.yml +++ b/fern/apis/ir-types-v4/generators.yml @@ -15,4 +15,4 @@ groups: - name: fernapi/fern-pydantic-model version: 0.0.33-5-g3540939 config: - wrapped_aliases: True + wrapped_aliases: true diff --git a/fern/ir-types-v5/definition/api.yml b/fern/apis/ir-types-v5/definition/api.yml similarity index 100% rename from fern/ir-types-v5/definition/api.yml rename to fern/apis/ir-types-v5/definition/api.yml diff --git a/fern/ir-types-v5/definition/auth.yml b/fern/apis/ir-types-v5/definition/auth.yml similarity index 100% rename from fern/ir-types-v5/definition/auth.yml rename to fern/apis/ir-types-v5/definition/auth.yml diff --git a/fern/ir-types-v5/definition/commons.yml b/fern/apis/ir-types-v5/definition/commons.yml similarity index 100% rename from fern/ir-types-v5/definition/commons.yml rename to fern/apis/ir-types-v5/definition/commons.yml diff --git a/fern/ir-types-v5/definition/constants.yml b/fern/apis/ir-types-v5/definition/constants.yml similarity index 100% rename from fern/ir-types-v5/definition/constants.yml rename to fern/apis/ir-types-v5/definition/constants.yml diff --git a/fern/ir-types-v5/definition/declaration.yml b/fern/apis/ir-types-v5/definition/declaration.yml similarity index 100% rename from fern/ir-types-v5/definition/declaration.yml rename to fern/apis/ir-types-v5/definition/declaration.yml diff --git a/fern/ir-types-v5/definition/environment.yml b/fern/apis/ir-types-v5/definition/environment.yml similarity index 100% rename from fern/ir-types-v5/definition/environment.yml rename to fern/apis/ir-types-v5/definition/environment.yml diff --git a/fern/ir-types-v5/definition/errors.yml b/fern/apis/ir-types-v5/definition/errors.yml similarity index 100% rename from fern/ir-types-v5/definition/errors.yml rename to fern/apis/ir-types-v5/definition/errors.yml diff --git a/fern/ir-types-v5/definition/http.yml b/fern/apis/ir-types-v5/definition/http.yml similarity index 100% rename from fern/ir-types-v5/definition/http.yml rename to fern/apis/ir-types-v5/definition/http.yml diff --git a/fern/ir-types-v5/definition/ir.yml b/fern/apis/ir-types-v5/definition/ir.yml similarity index 100% rename from fern/ir-types-v5/definition/ir.yml rename to fern/apis/ir-types-v5/definition/ir.yml diff --git a/fern/ir-types-v5/definition/types.yml b/fern/apis/ir-types-v5/definition/types.yml similarity index 100% rename from fern/ir-types-v5/definition/types.yml rename to fern/apis/ir-types-v5/definition/types.yml diff --git a/fern/ir-types-v5/generators.yml b/fern/apis/ir-types-v5/generators.yml similarity index 100% rename from fern/ir-types-v5/generators.yml rename to fern/apis/ir-types-v5/generators.yml diff --git a/fern/ir-types-v6/definition/api.yml b/fern/apis/ir-types-v6/definition/api.yml similarity index 100% rename from fern/ir-types-v6/definition/api.yml rename to fern/apis/ir-types-v6/definition/api.yml diff --git a/fern/ir-types-v6/definition/auth.yml b/fern/apis/ir-types-v6/definition/auth.yml similarity index 100% rename from fern/ir-types-v6/definition/auth.yml rename to fern/apis/ir-types-v6/definition/auth.yml diff --git a/fern/ir-types-v6/definition/commons.yml b/fern/apis/ir-types-v6/definition/commons.yml similarity index 100% rename from fern/ir-types-v6/definition/commons.yml rename to fern/apis/ir-types-v6/definition/commons.yml diff --git a/fern/ir-types-v6/definition/constants.yml b/fern/apis/ir-types-v6/definition/constants.yml similarity index 100% rename from fern/ir-types-v6/definition/constants.yml rename to fern/apis/ir-types-v6/definition/constants.yml diff --git a/fern/ir-types-v6/definition/declaration.yml b/fern/apis/ir-types-v6/definition/declaration.yml similarity index 100% rename from fern/ir-types-v6/definition/declaration.yml rename to fern/apis/ir-types-v6/definition/declaration.yml diff --git a/fern/ir-types-v6/definition/environment.yml b/fern/apis/ir-types-v6/definition/environment.yml similarity index 100% rename from fern/ir-types-v6/definition/environment.yml rename to fern/apis/ir-types-v6/definition/environment.yml diff --git a/fern/ir-types-v6/definition/errors.yml b/fern/apis/ir-types-v6/definition/errors.yml similarity index 100% rename from fern/ir-types-v6/definition/errors.yml rename to fern/apis/ir-types-v6/definition/errors.yml diff --git a/fern/ir-types-v6/definition/http.yml b/fern/apis/ir-types-v6/definition/http.yml similarity index 100% rename from fern/ir-types-v6/definition/http.yml rename to fern/apis/ir-types-v6/definition/http.yml diff --git a/fern/ir-types-v6/definition/ir.yml b/fern/apis/ir-types-v6/definition/ir.yml similarity index 100% rename from fern/ir-types-v6/definition/ir.yml rename to fern/apis/ir-types-v6/definition/ir.yml diff --git a/fern/ir-types-v6/definition/types.yml b/fern/apis/ir-types-v6/definition/types.yml similarity index 100% rename from fern/ir-types-v6/definition/types.yml rename to fern/apis/ir-types-v6/definition/types.yml diff --git a/fern/ir-types-v11/generators.yml b/fern/apis/ir-types-v6/generators.yml similarity index 99% rename from fern/ir-types-v11/generators.yml rename to fern/apis/ir-types-v6/generators.yml index cbb0277fcea..a0b6695f9b0 100644 --- a/fern/ir-types-v11/generators.yml +++ b/fern/apis/ir-types-v6/generators.yml @@ -12,7 +12,6 @@ groups: version: 0.0.130-2-g36322d7 config: wrapped-aliases: true - - name: fernapi/fern-pydantic-model version: 0.0.34-1-g024c753 config: diff --git a/fern/ir-types-v7/definition/api.yml b/fern/apis/ir-types-v7/definition/api.yml similarity index 100% rename from fern/ir-types-v7/definition/api.yml rename to fern/apis/ir-types-v7/definition/api.yml diff --git a/fern/ir-types-v7/definition/auth.yml b/fern/apis/ir-types-v7/definition/auth.yml similarity index 100% rename from fern/ir-types-v7/definition/auth.yml rename to fern/apis/ir-types-v7/definition/auth.yml diff --git a/fern/ir-types-v7/definition/commons.yml b/fern/apis/ir-types-v7/definition/commons.yml similarity index 100% rename from fern/ir-types-v7/definition/commons.yml rename to fern/apis/ir-types-v7/definition/commons.yml diff --git a/fern/ir-types-v7/definition/constants.yml b/fern/apis/ir-types-v7/definition/constants.yml similarity index 100% rename from fern/ir-types-v7/definition/constants.yml rename to fern/apis/ir-types-v7/definition/constants.yml diff --git a/fern/ir-types-v7/definition/declaration.yml b/fern/apis/ir-types-v7/definition/declaration.yml similarity index 100% rename from fern/ir-types-v7/definition/declaration.yml rename to fern/apis/ir-types-v7/definition/declaration.yml diff --git a/fern/ir-types-v7/definition/environment.yml b/fern/apis/ir-types-v7/definition/environment.yml similarity index 100% rename from fern/ir-types-v7/definition/environment.yml rename to fern/apis/ir-types-v7/definition/environment.yml diff --git a/fern/ir-types-v7/definition/errors.yml b/fern/apis/ir-types-v7/definition/errors.yml similarity index 100% rename from fern/ir-types-v7/definition/errors.yml rename to fern/apis/ir-types-v7/definition/errors.yml diff --git a/fern/ir-types-v7/definition/http.yml b/fern/apis/ir-types-v7/definition/http.yml similarity index 100% rename from fern/ir-types-v7/definition/http.yml rename to fern/apis/ir-types-v7/definition/http.yml diff --git a/fern/ir-types-v7/definition/ir.yml b/fern/apis/ir-types-v7/definition/ir.yml similarity index 100% rename from fern/ir-types-v7/definition/ir.yml rename to fern/apis/ir-types-v7/definition/ir.yml diff --git a/fern/ir-types-v7/definition/types.yml b/fern/apis/ir-types-v7/definition/types.yml similarity index 100% rename from fern/ir-types-v7/definition/types.yml rename to fern/apis/ir-types-v7/definition/types.yml diff --git a/fern/ir-types-v7/generators.yml b/fern/apis/ir-types-v7/generators.yml similarity index 99% rename from fern/ir-types-v7/generators.yml rename to fern/apis/ir-types-v7/generators.yml index cbb0277fcea..a0b6695f9b0 100644 --- a/fern/ir-types-v7/generators.yml +++ b/fern/apis/ir-types-v7/generators.yml @@ -12,7 +12,6 @@ groups: version: 0.0.130-2-g36322d7 config: wrapped-aliases: true - - name: fernapi/fern-pydantic-model version: 0.0.34-1-g024c753 config: diff --git a/fern/ir-types-v8/definition/api.yml b/fern/apis/ir-types-v8/definition/api.yml similarity index 100% rename from fern/ir-types-v8/definition/api.yml rename to fern/apis/ir-types-v8/definition/api.yml diff --git a/fern/ir-types-v8/definition/auth.yml b/fern/apis/ir-types-v8/definition/auth.yml similarity index 100% rename from fern/ir-types-v8/definition/auth.yml rename to fern/apis/ir-types-v8/definition/auth.yml diff --git a/fern/ir-types-v8/definition/commons.yml b/fern/apis/ir-types-v8/definition/commons.yml similarity index 100% rename from fern/ir-types-v8/definition/commons.yml rename to fern/apis/ir-types-v8/definition/commons.yml diff --git a/fern/ir-types-v8/definition/constants.yml b/fern/apis/ir-types-v8/definition/constants.yml similarity index 100% rename from fern/ir-types-v8/definition/constants.yml rename to fern/apis/ir-types-v8/definition/constants.yml diff --git a/fern/ir-types-v8/definition/declaration.yml b/fern/apis/ir-types-v8/definition/declaration.yml similarity index 100% rename from fern/ir-types-v8/definition/declaration.yml rename to fern/apis/ir-types-v8/definition/declaration.yml diff --git a/fern/ir-types-v8/definition/environment.yml b/fern/apis/ir-types-v8/definition/environment.yml similarity index 100% rename from fern/ir-types-v8/definition/environment.yml rename to fern/apis/ir-types-v8/definition/environment.yml diff --git a/fern/ir-types-v8/definition/errors.yml b/fern/apis/ir-types-v8/definition/errors.yml similarity index 100% rename from fern/ir-types-v8/definition/errors.yml rename to fern/apis/ir-types-v8/definition/errors.yml diff --git a/fern/ir-types-v8/definition/http.yml b/fern/apis/ir-types-v8/definition/http.yml similarity index 100% rename from fern/ir-types-v8/definition/http.yml rename to fern/apis/ir-types-v8/definition/http.yml diff --git a/fern/ir-types-v8/definition/ir.yml b/fern/apis/ir-types-v8/definition/ir.yml similarity index 100% rename from fern/ir-types-v8/definition/ir.yml rename to fern/apis/ir-types-v8/definition/ir.yml diff --git a/fern/ir-types-v8/definition/types.yml b/fern/apis/ir-types-v8/definition/types.yml similarity index 100% rename from fern/ir-types-v8/definition/types.yml rename to fern/apis/ir-types-v8/definition/types.yml diff --git a/fern/apis/ir-types-v8/generators.yml b/fern/apis/ir-types-v8/generators.yml new file mode 100644 index 00000000000..a0b6695f9b0 --- /dev/null +++ b/fern/apis/ir-types-v8/generators.yml @@ -0,0 +1,18 @@ +default-group: local +groups: + local: + generators: + - name: fernapi/fern-typescript + version: 0.0.197 + config: + mode: model + sdks: + generators: + - name: fernapi/java-model + version: 0.0.130-2-g36322d7 + config: + wrapped-aliases: true + - name: fernapi/fern-pydantic-model + version: 0.0.34-1-g024c753 + config: + wrapped_aliases: true diff --git a/fern/ir-types-v9/definition/api.yml b/fern/apis/ir-types-v9/definition/api.yml similarity index 100% rename from fern/ir-types-v9/definition/api.yml rename to fern/apis/ir-types-v9/definition/api.yml diff --git a/fern/ir-types-v9/definition/auth.yml b/fern/apis/ir-types-v9/definition/auth.yml similarity index 100% rename from fern/ir-types-v9/definition/auth.yml rename to fern/apis/ir-types-v9/definition/auth.yml diff --git a/fern/ir-types-v9/definition/commons.yml b/fern/apis/ir-types-v9/definition/commons.yml similarity index 100% rename from fern/ir-types-v9/definition/commons.yml rename to fern/apis/ir-types-v9/definition/commons.yml diff --git a/fern/ir-types-v9/definition/constants.yml b/fern/apis/ir-types-v9/definition/constants.yml similarity index 100% rename from fern/ir-types-v9/definition/constants.yml rename to fern/apis/ir-types-v9/definition/constants.yml diff --git a/fern/ir-types-v9/definition/declaration.yml b/fern/apis/ir-types-v9/definition/declaration.yml similarity index 100% rename from fern/ir-types-v9/definition/declaration.yml rename to fern/apis/ir-types-v9/definition/declaration.yml diff --git a/fern/ir-types-v9/definition/environment.yml b/fern/apis/ir-types-v9/definition/environment.yml similarity index 100% rename from fern/ir-types-v9/definition/environment.yml rename to fern/apis/ir-types-v9/definition/environment.yml diff --git a/fern/ir-types-v9/definition/errors.yml b/fern/apis/ir-types-v9/definition/errors.yml similarity index 100% rename from fern/ir-types-v9/definition/errors.yml rename to fern/apis/ir-types-v9/definition/errors.yml diff --git a/fern/ir-types-v9/definition/http.yml b/fern/apis/ir-types-v9/definition/http.yml similarity index 100% rename from fern/ir-types-v9/definition/http.yml rename to fern/apis/ir-types-v9/definition/http.yml diff --git a/fern/ir-types-v9/definition/ir.yml b/fern/apis/ir-types-v9/definition/ir.yml similarity index 100% rename from fern/ir-types-v9/definition/ir.yml rename to fern/apis/ir-types-v9/definition/ir.yml diff --git a/fern/ir-types-v9/definition/types.yml b/fern/apis/ir-types-v9/definition/types.yml similarity index 100% rename from fern/ir-types-v9/definition/types.yml rename to fern/apis/ir-types-v9/definition/types.yml diff --git a/fern/apis/ir-types-v9/generators.yml b/fern/apis/ir-types-v9/generators.yml new file mode 100644 index 00000000000..a0b6695f9b0 --- /dev/null +++ b/fern/apis/ir-types-v9/generators.yml @@ -0,0 +1,18 @@ +default-group: local +groups: + local: + generators: + - name: fernapi/fern-typescript + version: 0.0.197 + config: + mode: model + sdks: + generators: + - name: fernapi/java-model + version: 0.0.130-2-g36322d7 + config: + wrapped-aliases: true + - name: fernapi/fern-pydantic-model + version: 0.0.34-1-g024c753 + config: + wrapped_aliases: true diff --git a/fern/openapi-ir/definition/api.yml b/fern/apis/openapi-ir/definition/api.yml similarity index 100% rename from fern/openapi-ir/definition/api.yml rename to fern/apis/openapi-ir/definition/api.yml diff --git a/fern/openapi-ir/definition/commons.yml b/fern/apis/openapi-ir/definition/commons.yml similarity index 100% rename from fern/openapi-ir/definition/commons.yml rename to fern/apis/openapi-ir/definition/commons.yml diff --git a/fern/openapi-ir/definition/example.yml b/fern/apis/openapi-ir/definition/example.yml similarity index 100% rename from fern/openapi-ir/definition/example.yml rename to fern/apis/openapi-ir/definition/example.yml diff --git a/fern/openapi-ir/definition/finalIr.yml b/fern/apis/openapi-ir/definition/finalIr.yml similarity index 100% rename from fern/openapi-ir/definition/finalIr.yml rename to fern/apis/openapi-ir/definition/finalIr.yml diff --git a/fern/openapi-ir/definition/parseIr.yml b/fern/apis/openapi-ir/definition/parseIr.yml similarity index 100% rename from fern/openapi-ir/definition/parseIr.yml rename to fern/apis/openapi-ir/definition/parseIr.yml diff --git a/fern/openapi-ir/generators.yml b/fern/apis/openapi-ir/generators.yml similarity index 82% rename from fern/openapi-ir/generators.yml rename to fern/apis/openapi-ir/generators.yml index 20fde8beeb5..f814b6b9da6 100644 --- a/fern/openapi-ir/generators.yml +++ b/fern/apis/openapi-ir/generators.yml @@ -4,9 +4,9 @@ groups: generators: - name: fernapi/fern-typescript version: 0.0.197 - config: - mode: model output: location: npm url: npm.buildwithfern.com - package-name: "@fern-fern/openapi-ir" + package-name: '@fern-fern/openapi-ir' + config: + mode: model diff --git a/fern/seed-config/definition/api.yml b/fern/apis/seed-config/definition/api.yml similarity index 100% rename from fern/seed-config/definition/api.yml rename to fern/apis/seed-config/definition/api.yml diff --git a/fern/seed-config/definition/config.yml b/fern/apis/seed-config/definition/config.yml similarity index 100% rename from fern/seed-config/definition/config.yml rename to fern/apis/seed-config/definition/config.yml diff --git a/fern/seed-config/generators.yml b/fern/apis/seed-config/generators.yml similarity index 84% rename from fern/seed-config/generators.yml rename to fern/apis/seed-config/generators.yml index c713091d034..f7bd327f774 100644 --- a/fern/seed-config/generators.yml +++ b/fern/apis/seed-config/generators.yml @@ -4,9 +4,9 @@ groups: generators: - name: fernapi/fern-typescript-node-sdk version: 0.7.4-rc3-3-gd2356023 - config: - noSerdeLayer: true output: location: npm url: npm.buildwithfern.com - package-name: "@fern-fern/seed-config" + package-name: '@fern-fern/seed-config' + config: + noSerdeLayer: true diff --git a/fern/fern.config.json b/fern/fern.config.json index 0bec4430871..9be6dfed6fc 100644 --- a/fern/fern.config.json +++ b/fern/fern.config.json @@ -1,4 +1,4 @@ { "organization": "fern", - "version": "0.14.3" + "version": "0.15.3" } diff --git a/fern/ir-types-v17/generators.yml b/fern/ir-types-v17/generators.yml deleted file mode 100644 index 7a94a54cac7..00000000000 --- a/fern/ir-types-v17/generators.yml +++ /dev/null @@ -1,20 +0,0 @@ -default-group: local -groups: - local: - generators: - - name: fernapi/fern-typescript - version: 0.0.197 - config: - mode: model - sdks: - generators: - - name: fernapi/java-model - version: 0.3.4 - config: - wrapped-aliases: true - enable-forward-compatible-enums: true - - - name: fernapi/fern-pydantic-model - version: 0.0.34-1-g024c753 - config: - wrapped_aliases: true diff --git a/fern/ir-types-v8/generators.yml b/fern/ir-types-v8/generators.yml deleted file mode 100644 index cbb0277fcea..00000000000 --- a/fern/ir-types-v8/generators.yml +++ /dev/null @@ -1,19 +0,0 @@ -default-group: local -groups: - local: - generators: - - name: fernapi/fern-typescript - version: 0.0.197 - config: - mode: model - sdks: - generators: - - name: fernapi/java-model - version: 0.0.130-2-g36322d7 - config: - wrapped-aliases: true - - - name: fernapi/fern-pydantic-model - version: 0.0.34-1-g024c753 - config: - wrapped_aliases: true diff --git a/fern/ir-types-v9/generators.yml b/fern/ir-types-v9/generators.yml deleted file mode 100644 index cbb0277fcea..00000000000 --- a/fern/ir-types-v9/generators.yml +++ /dev/null @@ -1,19 +0,0 @@ -default-group: local -groups: - local: - generators: - - name: fernapi/fern-typescript - version: 0.0.197 - config: - mode: model - sdks: - generators: - - name: fernapi/java-model - version: 0.0.130-2-g36322d7 - config: - wrapped-aliases: true - - - name: fernapi/fern-pydantic-model - version: 0.0.34-1-g024c753 - config: - wrapped_aliases: true diff --git a/jest.config.ts b/jest.config.ts index 92b0e5da316..4c2fc452545 100644 --- a/jest.config.ts +++ b/jest.config.ts @@ -1,42 +1,19 @@ -import IS_CI from "is-ci"; import { Config } from "jest"; -import { getAllPackages } from "./packages/scripts/src/getAllPackages"; import defaultConfig from "./shared/jest.config.shared"; export default async (): Promise<Config> => { - const packages = await getAllPackages({ - // in PRs, only run tests on the changed packages - since: isBranchInCi() - }); - return { - ...defaultConfig, + ...defaultConfig // if there are no packages, then jest will run all tests by default. // so in that case, change the test match to a dummy path that doesn't // match anything. - testMatch: packages.length > 0 ? defaultConfig.testMatch : ["__path_that_does_not_exist"], - projects: packages.map((p) => { - return { - ...defaultConfig, - displayName: p.name, - rootDir: `${p.location}/src` - }; - }) + // testMatch: packages.length > 0 ? defaultConfig.testMatch : ["__path_that_does_not_exist"], + // projects: packages.map((p) => { + // return { + // ...defaultConfig, + // displayName: p.name, + // rootDir: `${p.location}/src` + // }; + // }) }; }; - -function isBranchInCi() { - if (!IS_CI) { - return false; - } - - const { CIRCLE_BRANCH, CIRCLE_TAG } = process.env; - if (CIRCLE_BRANCH === "main") { - return false; - } - if (CIRCLE_TAG != null && CIRCLE_TAG.length > 0) { - return false; - } - - return true; -} diff --git a/package.json b/package.json index 8515db3a941..8630ee8e2f7 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "jsonc-parser": "~2.2.1", "lint-staged": "^13.0.3", "lodash-es": "^4.17.21", - "mrlint": "^0.0.125", + "mrlint": "^0.0.131", "organize-imports-cli": "^0.10.0", "prettier": "^2.7.1", "react": "^18.2.0", diff --git a/packages/cli/generation/ir-generator/src/__test__/__snapshots__/api.txt b/packages/cli/generation/ir-generator/src/__test__/__snapshots__/api.txt index 1ffc632e987..7d7ecb93db5 100644 --- a/packages/cli/generation/ir-generator/src/__test__/__snapshots__/api.txt +++ b/packages/cli/generation/ir-generator/src/__test__/__snapshots__/api.txt @@ -1,6 +1,666 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`generate IR 1`] = ` +{ + "apiDisplayName": null, + "apiDocs": null, + "apiName": { + "camelCase": { + "safeName": "api", + "unsafeName": "api", + }, + "originalName": "api", + "pascalCase": { + "safeName": "Api", + "unsafeName": "Api", + }, + "screamingSnakeCase": { + "safeName": "API", + "unsafeName": "API", + }, + "snakeCase": { + "safeName": "api", + "unsafeName": "api", + }, + }, + "auth": { + "docs": null, + "requirement": "ALL", + "schemes": [ + { + "_type": "bearer", + "docs": null, + "token": { + "camelCase": { + "safeName": "token", + "unsafeName": "token", + }, + "originalName": "token", + "pascalCase": { + "safeName": "Token", + "unsafeName": "Token", + }, + "screamingSnakeCase": { + "safeName": "TOKEN", + "unsafeName": "TOKEN", + }, + "snakeCase": { + "safeName": "token", + "unsafeName": "token", + }, + }, + "tokenEnvVar": null, + }, + ], + }, + "basePath": null, + "constants": { + "errorInstanceIdKey": { + "name": { + "camelCase": { + "safeName": "errorInstanceId", + "unsafeName": "errorInstanceId", + }, + "originalName": "errorInstanceId", + "pascalCase": { + "safeName": "ErrorInstanceId", + "unsafeName": "ErrorInstanceId", + }, + "screamingSnakeCase": { + "safeName": "ERROR_INSTANCE_ID", + "unsafeName": "ERROR_INSTANCE_ID", + }, + "snakeCase": { + "safeName": "error_instance_id", + "unsafeName": "error_instance_id", + }, + }, + "wireValue": "errorInstanceId", + }, + }, + "environments": null, + "errorDiscriminationStrategy": { + "type": "statusCode", + }, + "errors": {}, + "headers": [], + "idempotencyHeaders": [], + "pathParameters": [], + "rootPackage": { + "docs": null, + "errors": [], + "fernFilepath": { + "allParts": [], + "file": null, + "packagePath": [], + }, + "hasEndpointsInTree": true, + "navigationConfig": null, + "service": null, + "subpackages": [ + "subpackage_svc", + ], + "types": [], + "webhooks": null, + }, + "sdkConfig": { + "hasFileDownloadEndpoints": false, + "hasStreamingEndpoints": false, + "isAuthMandatory": false, + "platformHeaders": { + "language": "X-Fern-Language", + "sdkName": "X-Fern-SDK-Name", + "sdkVersion": "X-Fern-SDK-Version", + }, + }, + "serviceTypeReferenceInfo": { + "sharedTypes": [], + "typesReferencedOnlyByService": { + "service_svc": [ + "type_svc:myEnum", + ], + }, + }, + "services": { + "service_svc": { + "availability": null, + "basePath": { + "head": "/", + "parts": [], + }, + "displayName": null, + "endpoints": [ + { + "allPathParameters": [], + "auth": false, + "availability": null, + "baseUrl": null, + "displayName": null, + "docs": null, + "errors": [], + "examples": [], + "fullPath": { + "head": "/test", + "parts": [], + }, + "headers": [], + "id": "endpoint_svc.test", + "idempotent": false, + "method": "GET", + "name": { + "camelCase": { + "safeName": "test", + "unsafeName": "test", + }, + "originalName": "test", + "pascalCase": { + "safeName": "Test", + "unsafeName": "Test", + }, + "screamingSnakeCase": { + "safeName": "TEST", + "unsafeName": "TEST", + }, + "snakeCase": { + "safeName": "test", + "unsafeName": "test", + }, + }, + "path": { + "head": "/test", + "parts": [], + }, + "pathParameters": [], + "queryParameters": [ + { + "allowMultiple": true, + "availability": null, + "docs": null, + "name": { + "name": { + "camelCase": { + "safeName": "someEnum", + "unsafeName": "someEnum", + }, + "originalName": "some-enum", + "pascalCase": { + "safeName": "SomeEnum", + "unsafeName": "SomeEnum", + }, + "screamingSnakeCase": { + "safeName": "SOME_ENUM", + "unsafeName": "SOME_ENUM", + }, + "snakeCase": { + "safeName": "some_enum", + "unsafeName": "some_enum", + }, + }, + "wireValue": "some-enum", + }, + "valueType": { + "_type": "container", + "container": { + "_type": "optional", + "optional": { + "_type": "named", + "fernFilepath": { + "allParts": [ + { + "camelCase": { + "safeName": "svc", + "unsafeName": "svc", + }, + "originalName": "svc", + "pascalCase": { + "safeName": "Svc", + "unsafeName": "Svc", + }, + "screamingSnakeCase": { + "safeName": "SVC", + "unsafeName": "SVC", + }, + "snakeCase": { + "safeName": "svc", + "unsafeName": "svc", + }, + }, + ], + "file": { + "camelCase": { + "safeName": "svc", + "unsafeName": "svc", + }, + "originalName": "svc", + "pascalCase": { + "safeName": "Svc", + "unsafeName": "Svc", + }, + "screamingSnakeCase": { + "safeName": "SVC", + "unsafeName": "SVC", + }, + "snakeCase": { + "safeName": "svc", + "unsafeName": "svc", + }, + }, + "packagePath": [], + }, + "name": { + "camelCase": { + "safeName": "myEnum", + "unsafeName": "myEnum", + }, + "originalName": "myEnum", + "pascalCase": { + "safeName": "MyEnum", + "unsafeName": "MyEnum", + }, + "screamingSnakeCase": { + "safeName": "MY_ENUM", + "unsafeName": "MY_ENUM", + }, + "snakeCase": { + "safeName": "my_enum", + "unsafeName": "my_enum", + }, + }, + "typeId": "type_svc:myEnum", + }, + }, + }, + }, + ], + "requestBody": null, + "response": { + "type": "json", + "value": { + "docs": null, + "responseBodyType": { + "_type": "primitive", + "primitive": "STRING", + }, + "type": "response", + }, + }, + "sdkRequest": { + "requestParameterName": { + "camelCase": { + "safeName": "request", + "unsafeName": "request", + }, + "originalName": "request", + "pascalCase": { + "safeName": "Request", + "unsafeName": "Request", + }, + "screamingSnakeCase": { + "safeName": "REQUEST", + "unsafeName": "REQUEST", + }, + "snakeCase": { + "safeName": "request", + "unsafeName": "request", + }, + }, + "shape": { + "bodyKey": { + "camelCase": { + "safeName": "body", + "unsafeName": "body", + }, + "originalName": "body", + "pascalCase": { + "safeName": "Body", + "unsafeName": "Body", + }, + "screamingSnakeCase": { + "safeName": "BODY", + "unsafeName": "BODY", + }, + "snakeCase": { + "safeName": "body", + "unsafeName": "body", + }, + }, + "type": "wrapper", + "wrapperName": { + "camelCase": { + "safeName": "test", + "unsafeName": "test", + }, + "originalName": "TEST", + "pascalCase": { + "safeName": "Test", + "unsafeName": "Test", + }, + "screamingSnakeCase": { + "safeName": "TEST", + "unsafeName": "TEST", + }, + "snakeCase": { + "safeName": "test", + "unsafeName": "test", + }, + }, + }, + }, + }, + ], + "headers": [], + "name": { + "fernFilepath": { + "allParts": [ + { + "camelCase": { + "safeName": "svc", + "unsafeName": "svc", + }, + "originalName": "svc", + "pascalCase": { + "safeName": "Svc", + "unsafeName": "Svc", + }, + "screamingSnakeCase": { + "safeName": "SVC", + "unsafeName": "SVC", + }, + "snakeCase": { + "safeName": "svc", + "unsafeName": "svc", + }, + }, + ], + "file": { + "camelCase": { + "safeName": "svc", + "unsafeName": "svc", + }, + "originalName": "svc", + "pascalCase": { + "safeName": "Svc", + "unsafeName": "Svc", + }, + "screamingSnakeCase": { + "safeName": "SVC", + "unsafeName": "SVC", + }, + "snakeCase": { + "safeName": "svc", + "unsafeName": "svc", + }, + }, + "packagePath": [], + }, + }, + "pathParameters": [], + }, + }, + "subpackages": { + "subpackage_svc": { + "docs": null, + "errors": [], + "fernFilepath": { + "allParts": [ + { + "camelCase": { + "safeName": "svc", + "unsafeName": "svc", + }, + "originalName": "svc", + "pascalCase": { + "safeName": "Svc", + "unsafeName": "Svc", + }, + "screamingSnakeCase": { + "safeName": "SVC", + "unsafeName": "SVC", + }, + "snakeCase": { + "safeName": "svc", + "unsafeName": "svc", + }, + }, + ], + "file": { + "camelCase": { + "safeName": "svc", + "unsafeName": "svc", + }, + "originalName": "svc", + "pascalCase": { + "safeName": "Svc", + "unsafeName": "Svc", + }, + "screamingSnakeCase": { + "safeName": "SVC", + "unsafeName": "SVC", + }, + "snakeCase": { + "safeName": "svc", + "unsafeName": "svc", + }, + }, + "packagePath": [], + }, + "hasEndpointsInTree": true, + "name": { + "camelCase": { + "safeName": "svc", + "unsafeName": "svc", + }, + "originalName": "svc", + "pascalCase": { + "safeName": "Svc", + "unsafeName": "Svc", + }, + "screamingSnakeCase": { + "safeName": "SVC", + "unsafeName": "SVC", + }, + "snakeCase": { + "safeName": "svc", + "unsafeName": "svc", + }, + }, + "navigationConfig": null, + "service": "service_svc", + "subpackages": [], + "types": [ + "type_svc:myEnum", + ], + "webhooks": null, + }, + }, + "types": { + "type_svc:myEnum": { + "availability": null, + "docs": null, + "examples": [], + "name": { + "fernFilepath": { + "allParts": [ + { + "camelCase": { + "safeName": "svc", + "unsafeName": "svc", + }, + "originalName": "svc", + "pascalCase": { + "safeName": "Svc", + "unsafeName": "Svc", + }, + "screamingSnakeCase": { + "safeName": "SVC", + "unsafeName": "SVC", + }, + "snakeCase": { + "safeName": "svc", + "unsafeName": "svc", + }, + }, + ], + "file": { + "camelCase": { + "safeName": "svc", + "unsafeName": "svc", + }, + "originalName": "svc", + "pascalCase": { + "safeName": "Svc", + "unsafeName": "Svc", + }, + "screamingSnakeCase": { + "safeName": "SVC", + "unsafeName": "SVC", + }, + "snakeCase": { + "safeName": "svc", + "unsafeName": "svc", + }, + }, + "packagePath": [], + }, + "name": { + "camelCase": { + "safeName": "myEnum", + "unsafeName": "myEnum", + }, + "originalName": "myEnum", + "pascalCase": { + "safeName": "MyEnum", + "unsafeName": "MyEnum", + }, + "screamingSnakeCase": { + "safeName": "MY_ENUM", + "unsafeName": "MY_ENUM", + }, + "snakeCase": { + "safeName": "my_enum", + "unsafeName": "my_enum", + }, + }, + "typeId": "type_svc:myEnum", + }, + "referencedTypes": [], + "shape": { + "_type": "enum", + "values": [ + { + "availability": null, + "docs": null, + "name": { + "name": { + "camelCase": { + "safeName": "one", + "unsafeName": "one", + }, + "originalName": "one", + "pascalCase": { + "safeName": "One", + "unsafeName": "One", + }, + "screamingSnakeCase": { + "safeName": "ONE", + "unsafeName": "ONE", + }, + "snakeCase": { + "safeName": "one", + "unsafeName": "one", + }, + }, + "wireValue": "one", + }, + }, + { + "availability": null, + "docs": null, + "name": { + "name": { + "camelCase": { + "safeName": "two", + "unsafeName": "two", + }, + "originalName": "two", + "pascalCase": { + "safeName": "Two", + "unsafeName": "Two", + }, + "screamingSnakeCase": { + "safeName": "TWO", + "unsafeName": "TWO", + }, + "snakeCase": { + "safeName": "two", + "unsafeName": "two", + }, + }, + "wireValue": "two", + }, + }, + { + "availability": null, + "docs": null, + "name": { + "name": { + "camelCase": { + "safeName": "three", + "unsafeName": "three", + }, + "originalName": "three", + "pascalCase": { + "safeName": "Three", + "unsafeName": "Three", + }, + "screamingSnakeCase": { + "safeName": "THREE", + "unsafeName": "THREE", + }, + "snakeCase": { + "safeName": "three", + "unsafeName": "three", + }, + }, + "wireValue": "three", + }, + }, + { + "availability": null, + "docs": null, + "name": { + "name": { + "camelCase": { + "safeName": "four", + "unsafeName": "four", + }, + "originalName": "four", + "pascalCase": { + "safeName": "Four", + "unsafeName": "Four", + }, + "screamingSnakeCase": { + "safeName": "FOUR", + "unsafeName": "FOUR", + }, + "snakeCase": { + "safeName": "four", + "unsafeName": "four", + }, + }, + "wireValue": "four", + }, + }, + ], + }, + }, + }, + "variables": [], + "webhookGroups": {}, +} +`; + +exports[`generate IR 2`] = ` { "apiDisplayName": null, "apiDocs": null, @@ -1538,7 +2198,7 @@ exports[`generate IR 1`] = ` } `; -exports[`generate IR 2`] = ` +exports[`generate IR 3`] = ` { "apiDisplayName": null, "apiDocs": null, @@ -3099,7 +3759,7 @@ exports[`generate IR 2`] = ` } `; -exports[`generate IR 3`] = ` +exports[`generate IR 4`] = ` { "apiDisplayName": null, "apiDocs": null, diff --git a/packages/cli/generation/ir-generator/src/__test__/generateIntermediateRepresentation.test.ts b/packages/cli/generation/ir-generator/src/__test__/generateIntermediateRepresentation.test.ts index a2e67692350..f9efe26fa3f 100644 --- a/packages/cli/generation/ir-generator/src/__test__/generateIntermediateRepresentation.test.ts +++ b/packages/cli/generation/ir-generator/src/__test__/generateIntermediateRepresentation.test.ts @@ -10,7 +10,7 @@ import { generateIntermediateRepresentation } from "../generateIntermediateRepre require("jest-specific-snapshot"); const TEST_DEFINITIONS_DIR = path.join(__dirname, "../../../../../../test-definitions"); -const FHIR_DIR = path.join(__dirname, "../../../../../../fern/fhir"); +const FHIR_DIR = path.join(__dirname, "../../../../../../fern/apis/fhir"); const TEST_DEFINITION_CONFIG: Record<string, TestConfig> = { audiences: { diff --git a/yarn.lock b/yarn.lock index d1eb5133049..01702500b34 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7962,7 +7962,7 @@ env-cmd@toddbluhm/env-cmd: jsonc-parser: ~2.2.1 lint-staged: ^13.0.3 lodash-es: ^4.17.21 - mrlint: ^0.0.125 + mrlint: ^0.0.131 organize-imports-cli: ^0.10.0 prettier: ^2.7.1 react: ^18.2.0 @@ -11588,12 +11588,12 @@ env-cmd@toddbluhm/env-cmd: languageName: node linkType: hard -"mrlint@npm:^0.0.125": - version: 0.0.125 - resolution: "mrlint@npm:0.0.125" +"mrlint@npm:^0.0.131": + version: 0.0.131 + resolution: "mrlint@npm:0.0.131" bin: mrlint: cli.cjs - checksum: bde995c273ce695299768439b6ec01d1adce2ba59c2cbc1608359d66c1b8f8ff1157436ad49d401197a1051743a9498ac24ac2a94f2e4f49705409ccdb857d78 + checksum: 664798f33f9885411811fd9a9954693e245d1673d0a0b10ab6a3c5596bccd1ab50671375d915761cfb56691ca00e959cb00073c157c785c15dee8e0028ec201d languageName: node linkType: hard