Skip to content

Commit

Permalink
Merge branch 'main' into ssanjay/timeseries
Browse files Browse the repository at this point in the history
  • Loading branch information
ssanjay1 committed Jul 11, 2024
2 parents 149cb18 + 4233a9a commit 383de83
Show file tree
Hide file tree
Showing 120 changed files with 1,622 additions and 1,641 deletions.
5 changes: 5 additions & 0 deletions .changeset/chilly-mayflies-vanish.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@osdk/client.api": minor
---

Fix dependencies to be peer only
5 changes: 5 additions & 0 deletions .changeset/chilly-melons-hammer.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@osdk/client": minor
---

Fix exports from client
8 changes: 8 additions & 0 deletions .changeset/curvy-cougars-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"@osdk/foundry-sdk-generator": minor
"@osdk/shared.test": minor
"@osdk/client.api": minor
"@osdk/client": minor
---

Expose $title property in OsdkBase
5 changes: 5 additions & 0 deletions .changeset/healthy-nails-relax.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@osdk/client": minor
---

Upgrades 'ws' to avoid false flag CVE
32 changes: 32 additions & 0 deletions .changeset/lazy-jobs-attend.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
---
"@osdk/foundry.thirdpartyapplications": minor
"@osdk/internal.foundry.ontologiesv2": minor
"@osdk/internal.foundry.ontologies": minor
"@osdk/internal.foundry.datasets": minor
"@osdk/internal.foundry.models": minor
"@osdk/platform-sdk-generator": minor
"@osdk/shared.net.platformapi": minor
"@osdk/foundry-sdk-generator": minor
"@osdk/internal.foundry.core": minor
"@osdk/client.test.ontology": minor
"@osdk/generator-converters": minor
"@osdk/cli.cmd.typescript": minor
"@osdk/shared.client.impl": minor
"@osdk/example-generator": minor
"@osdk/foundry.security": minor
"@osdk/internal.foundry": minor
"@osdk/shared.net.fetch": minor
"@osdk/legacy-client": minor
"@osdk/foundry.core": minor
"@osdk/shared.test": minor
"@osdk/client.api": minor
"@osdk/shared.net": minor
"@osdk/generator": minor
"@osdk/foundry": minor
"@osdk/client": minor
"@osdk/maker": minor
"@osdk/api": minor
"@osdk/cli": minor
---

Change all internal dependencies to be tilde not caret
5 changes: 5 additions & 0 deletions .changeset/lovely-mice-beg.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@osdk/create-app": patch
---

fix AIP template
5 changes: 5 additions & 0 deletions .changeset/old-kiwis-marry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@osdk/client": patch
---

It is possible to pass a Promise<string> for ontologyRid on client creation
5 changes: 5 additions & 0 deletions .changeset/orange-icons-battle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@osdk/create-app": patch
---

update AIP template
21 changes: 20 additions & 1 deletion .changeset/pre.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,33 +52,52 @@
"@osdk/version-updater": "0.0.0",
"watch": "0.0.0",
"@osdk/tests.verify-fallback-package": "0.0.3",
"@osdk/tests.verify-fallback-package-v2": "0.0.3"
"@osdk/tests.verify-fallback-package-v2": "0.0.3",
"@osdk/examples.tutorial-todo-aip-app": "0.0.0",
"@osdk/client.unstable": "0.0.0",
"@osdk/client.unstable.osw": "0.0.0"
},
"changesets": [
"calm-pillows-collect",
"chilly-melons-hammer",
"chilly-singers-compare",
"cool-rice-check",
"cuddly-pens-smash",
"curvy-cougars-report",
"dirty-hotels-build",
"early-coats-sip",
"eight-hats-joke",
"fast-parents-learn",
"four-ways-add",
"great-geese-fail",
"green-chefs-speak",
"itchy-radios-own",
"khaki-plants-sort",
"large-ads-listen",
"lovely-mice-beg",
"moody-bats-hear",
"moody-crews-ring",
"nervous-parrots-admire",
"nervous-pets-return",
"ninety-avocados-unite",
"pink-insects-itch",
"plenty-peaches-scream",
"pretty-cherries-hunt",
"pretty-dingos-smash",
"purple-cameras-invite",
"purple-trainers-laugh",
"rotten-lamps-protect",
"rotten-shirts-cross",
"serious-glasses-try",
"sharp-penguins-double",
"shy-cougars-remain",
"smart-feet-chew",
"spicy-roses-compete",
"tame-wolves-juggle",
"tasty-kiwis-attack",
"thin-eggs-prove",
"tough-hats-push",
"unlucky-moose-lay",
"unlucky-wombats-switch",
"wild-plums-yell"
]
Expand Down
5 changes: 5 additions & 0 deletions .changeset/purple-pots-fold.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@osdk/maker": minor
---

Update ontology as code interface link types to reflect internal expectations of ontology integration
5 changes: 5 additions & 0 deletions .changeset/serious-camels-rest.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@osdk/client.api": patch
---

Directly depends on @osdk/api instead of peer
5 changes: 5 additions & 0 deletions .changeset/wild-shrimps-join.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@osdk/client": patch
---

ClientCache now uses a key field as the cache key instead of the entire client
15 changes: 15 additions & 0 deletions .changeset/young-fireants-repair.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
"@osdk/foundry.thirdpartyapplications": minor
"@osdk/internal.foundry.ontologiesv2": minor
"@osdk/internal.foundry.ontologies": minor
"@osdk/internal.foundry.datasets": minor
"@osdk/internal.foundry.models": minor
"@osdk/platform-sdk-generator": minor
"@osdk/internal.foundry.core": minor
"@osdk/foundry.security": minor
"@osdk/internal.foundry": minor
"@osdk/foundry.core": minor
"@osdk/foundry": minor
---

Modified codegen so that return types now include Blobs.
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ updates:
directory: "/"
schedule:
interval: "daily"
groups:
typescript-eslint:
applies-to: version-updates
patterns:
- "typescript-eslint"
- "@typescript-eslint/*"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
Expand Down
5 changes: 2 additions & 3 deletions .monorepolint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ const esmOnlyPackages = [
"@osdk/tool.release",
"@osdk/version-updater",
"@osdk/client.test.ontology",
"watch",
// "@osdk/examples.*", but they have their own config cause they are nonstandard
];

Expand Down Expand Up @@ -420,8 +419,8 @@ export default {
],
options: {
dependencies: {
"@osdk/shared.client": "workspace:^",
"@osdk/shared.net.platformapi": "workspace:^",
"@osdk/shared.client": "workspace:~",
"@osdk/shared.net.platformapi": "workspace:~",
},
},
}),
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"editor.defaultFormatter": "dprint.dprint"
},
"[typescript]": {
"editor.defaultFormatter": "dprint.dprint"
"editor.defaultFormatter": "vscode.typescript-language-features"
},
"[json]": {
"editor.defaultFormatter": "dprint.dprint"
Expand Down
14 changes: 7 additions & 7 deletions examples-extra/basic/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,19 @@
"typecheck": "../../../scripts/build_common/typecheck.sh esm"
},
"dependencies": {
"@osdk/api": "workspace:^",
"@osdk/client": "workspace:^",
"@osdk/api": "workspace:~",
"@osdk/client": "workspace:~",
"@osdk/client.api": "workspace:*",
"@osdk/examples.basic.sdk": "workspace:^",
"@osdk/foundry": "workspace:^",
"@osdk/internal.foundry": "workspace:^",
"@osdk/examples.basic.sdk": "workspace:~",
"@osdk/foundry": "workspace:~",
"@osdk/internal.foundry": "workspace:~",
"chalk": "^5.3.0",
"pino": "^9.1.0",
"pino-pretty": "^11.0.0",
"pino-pretty": "^11.2.1",
"tiny-invariant": "^1.3.1"
},
"devDependencies": {
"@osdk/cli": "workspace:^",
"@osdk/cli": "workspace:~",
"@types/node": "^18.0.0",
"ts-expect": "^1.3.0"
},
Expand Down
14 changes: 7 additions & 7 deletions examples-extra/basic/sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,19 @@
"typecheck": "../../../scripts/build_common/typecheck.sh esm"
},
"dependencies": {
"@osdk/api": "workspace:^",
"@osdk/api": "workspace:~",
"@osdk/client.api": "workspace:*"
},
"peerDependencies": {
"@osdk/api": "workspace:^",
"@osdk/client": "workspace:^",
"@osdk/client.api": "workspace:^"
"@osdk/api": "workspace:~",
"@osdk/client": "workspace:~",
"@osdk/client.api": "workspace:~"
},
"devDependencies": {
"@arethetypeswrong/cli": "^0.15.2",
"@osdk/api": "workspace:^",
"@osdk/cli.cmd.typescript": "workspace:^",
"@osdk/client.api": "workspace:^",
"@osdk/api": "workspace:~",
"@osdk/cli.cmd.typescript": "workspace:~",
"@osdk/client.api": "workspace:~",
"tslib": "^2.6.2",
"typescript": "^5.4.5"
},
Expand Down
26 changes: 13 additions & 13 deletions examples-extra/docs_example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,36 +15,36 @@
"preview": "vite preview"
},
"dependencies": {
"@osdk/api": "workspace:^",
"@osdk/client": "workspace:^",
"@osdk/client.api": "workspace:^",
"@osdk/legacy-client": "workspace:^",
"@osdk/api": "workspace:~",
"@osdk/client": "workspace:~",
"@osdk/client.api": "workspace:~",
"@osdk/legacy-client": "workspace:~",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"swr": "^2.2.5"
},
"peerDependencies": {
"@osdk/api": "workspace:^",
"@osdk/client": "workspace:^",
"@osdk/client.api": "workspace:^"
"@osdk/api": "workspace:~",
"@osdk/client": "workspace:~",
"@osdk/client.api": "workspace:~"
},
"devDependencies": {
"@arethetypeswrong/cli": "^0.15.2",
"@osdk/api": "workspace:^",
"@osdk/cli.cmd.typescript": "workspace:^",
"@osdk/client.api": "workspace:^",
"@osdk/api": "workspace:~",
"@osdk/cli.cmd.typescript": "workspace:~",
"@osdk/client.api": "workspace:~",
"@types/react": "^18.3.2",
"@types/react-dom": "^18.2.25",
"@typescript-eslint/eslint-plugin": "^7.9.0",
"@typescript-eslint/parser": "^7.9.0",
"@typescript-eslint/eslint-plugin": "^7.16.0",
"@typescript-eslint/parser": "^7.16.0",
"@vitejs/plugin-react": "^4.2.1",
"autoprefixer": "^10.4.19",
"eslint": "^8.57.0",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react-refresh": "^0.4.7",
"postcss": "^8.4.31",
"rollup-plugin-visualizer": "^5.12.0",
"tailwindcss": "^3.4.3",
"tailwindcss": "^3.4.4",
"tslib": "^2.6.2",
"typescript": "^5.4.5",
"vite": "^5.2.11"
Expand Down
8 changes: 4 additions & 4 deletions examples-extra/one_dot_one/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
"typecheck": "../../scripts/build_common/typecheck.sh both"
},
"dependencies": {
"@osdk/api": "workspace:^",
"@osdk/generator": "workspace:^",
"@osdk/legacy-client": "workspace:^"
"@osdk/api": "workspace:~",
"@osdk/generator": "workspace:~",
"@osdk/legacy-client": "workspace:~"
},
"peerDependencies": {
"@osdk/api": "^1.8.0",
Expand All @@ -42,7 +42,7 @@
"devDependencies": {
"@arethetypeswrong/cli": "^0.15.2",
"@osdk/api": "^1.8.0",
"@osdk/cli.cmd.typescript": "workspace:^",
"@osdk/cli.cmd.typescript": "workspace:~",
"@osdk/legacy-client": "^2.4.0-beta.0",
"@types/node": "^18.0.0",
"tslib": "^2.6.2",
Expand Down
24 changes: 12 additions & 12 deletions examples-extra/todoapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,36 +15,36 @@
"preview": "vite preview"
},
"dependencies": {
"@osdk/api": "workspace:^",
"@osdk/client": "workspace:^",
"@osdk/api": "workspace:~",
"@osdk/client": "workspace:~",
"@osdk/client.api": "workspace:*",
"@osdk/oauth": "workspace:^",
"@osdk/oauth": "workspace:~",
"core-js": "^3.37.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"swr": "^2.2.5",
"tiny-invariant": "^1.3.3"
},
"peerDependencies": {
"@osdk/api": "workspace:^",
"@osdk/client": "workspace:^",
"@osdk/client.api": "workspace:^"
"@osdk/api": "workspace:~",
"@osdk/client": "workspace:~",
"@osdk/client.api": "workspace:~"
},
"devDependencies": {
"@arethetypeswrong/cli": "^0.15.2",
"@osdk/api": "workspace:^",
"@osdk/cli.cmd.typescript": "workspace:^",
"@osdk/client.api": "workspace:^",
"@osdk/api": "workspace:~",
"@osdk/cli.cmd.typescript": "workspace:~",
"@osdk/client.api": "workspace:~",
"@types/core-js": "^2.5.8",
"@types/react": "^18.3.2",
"@types/react-dom": "^18.2.25",
"@typescript-eslint/eslint-plugin": "^7.9.0",
"@typescript-eslint/parser": "^7.9.0",
"@typescript-eslint/eslint-plugin": "^7.16.0",
"@typescript-eslint/parser": "^7.16.0",
"@vitejs/plugin-react": "^4.2.1",
"autoprefixer": "^10.4.19",
"postcss": "^8.4.31",
"rollup-plugin-visualizer": "^5.12.0",
"tailwindcss": "^3.4.3",
"tailwindcss": "^3.4.4",
"tslib": "^2.6.2",
"typescript": "^5.4.5",
"vite": "^5.2.11"
Expand Down
1 change: 1 addition & 0 deletions examples-extra/todoapp/src/useTodos.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ function createFauxTodo(title: string): SimpleTodo {
isComplete: false,
__primaryKey: title,
__apiName: "Todo",
$title: title,
$primaryKey: title,
$apiName: "Todo",
$objectType: "Todo",
Expand Down
Loading

0 comments on commit 383de83

Please sign in to comment.