Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
127 changes: 95 additions & 32 deletions bun.lock

Large diffs are not rendered by default.

18 changes: 14 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,19 @@
"keywords": [],
"license": "Apache-2.0",
"author": "Ian Macalinao <me@ianm.com>",
"workspaces": [
"packages/*"
],
"workspaces": {
"packages": [
"packages/*"
],
"catalog": {
"@macalinao/tsconfig": "^3.2.5",
"@types/bun": "latest",
"temporal-polyfill": "^1.0.1",
"temporal-spec": "^1.0.0",
"tslib": "^2.8.1",
"typescript": "^7.0.2"
}
},
"scripts": {
"build": "turbo run build",
"clean": "turbo run clean",
Expand All @@ -29,7 +39,7 @@
"oxlint-tsgolint": "0.23.0",
"turbo": "^2.10.7",
"typedoc": "^0.28.20",
"typescript": "^5.9.3"
"typescript": "~6.0.3"

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🗄️ Data Integrity & Integration | 🟡 Minor | ⚡ Quick win

🧩 Analysis chain

🏁 Script executed:

#!/usr/bin/env bash
set -euo pipefail

echo "== root versions =="
jq '{catalog_typescript: .workspaces.catalog.typescript,
     root_typescript: .devDependencies.typescript}' package.json

echo "== workspace TypeScript versions =="
fd --type f --glob 'package.json' packages | sort | while IFS= read -r file; do
  jq -r --arg file "$file" \
    '[$file, (.devDependencies.typescript // "<unset>")] | `@tsv`' "$file"
done

echo "== lockfiles =="
fd --hidden --type f --glob 'bun.lock*' .

echo "== TypeScript declarations =="
rg -n '"typescript"[[:space:]]*:' package.json packages --glob 'package.json'

Repository: macalinao/temporal-utils

Length of output: 1267


🏁 Script executed:

#!/usr/bin/env bash
set -euo pipefail

echo "== root package.json relevant sections =="
cat -n package.json | sed -n '1,80p'

echo "== root scripts =="
jq -r '.scripts // {} | to_entries[] | "\(.key)=\(.value)"' package.json

echo "== package.json TypeScript/package-manager consistency =="
python3 - <<'PY'
import json
from pathlib import Path

root = json.loads(Path("package.json").read_text())
catalog_ts = root.get("workspaces", {}).get("catalog", {}).get("typescript", "<unset>")
root_ts = root.get("devDependencies", {}).get("typescript", "<unset>")
print({"catalog": catalog_ts, "root": root_ts, "packageManager": root.get("packageManager")})

packages = sorted(Path(".").glob("packages/*/package.json"))
print("workspace_catalog_count", sum(
    json.loads(p.read_text()).get("devDependencies", {}).get("typescript") == "catalog:"
    for p in packages
), "of", len(packages))
PY

echo "== lint/build package references =="
rg -n '"eslint|typescript-eslint|`@typescript-eslint`|tsc|tsserver|node_modules/.*typescript|esbuild|tsup|tsconfig' package.json packages --glob 'package.json' --glob 'tsconfig.json' --glob 'eslint.*' --glob '*.mjs' --glob '*.js' --glob '*.cjs' --glob '*.ts' | sed -n '1,200p'

Repository: macalinao/temporal-utils

Length of output: 5230


🏁 Script executed:

#!/usr/bin/env bash
set -euo pipefail

echo "== lockfile TypeScript entries =="
if [ -f bun.lock ]; then
  rg -n 'typescript|bun-types|tsconfig|oxlint-tsgolint|oxlint|oxfmt' bun.lock | sed -n '1,220p'
fi

echo "== lock package-manager versions =="
python3 - <<'PY'
from pathlib import Path
text = Path("bun.lock").read_text()
for term in ["`@macalinao/tsconfig`", "typescript", "oxlint-tsgolint", "oxlint", "oxfmt", "typedoc"]:
    print(term)
    for i, line in enumerate(text.splitlines(), 1):
        if term in line:
            print(f"{i}: {line}")
PY

echo "== lockfile node resolution hints =="
rg -n 'node:\s*|\.bin|dependencies|devDependencies' bun.lock | sed -n '1,120p'

Repository: macalinao/temporal-utils

Length of output: 50380


Resolve the root TypeScript version conflict.

packages/* use "typescript": "catalog:", and bun.lock installs TypeScript 6.3.3 directly plus workspace TypeScript 7.0.2 packages. Keep package.json:42 on the catalog version or remove the root dependency if it is not used.

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@package.json` at line 42, Resolve the TypeScript version conflict by updating
the root package.json dependency to use the workspace catalog version, matching
the "typescript": "catalog:" declarations in packages/*, or remove the root
TypeScript dependency if it is unused. Preserve the workspace’s existing
catalog-managed versions.

},
"engines": {
"bun": ">=1.0.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/format-temporal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
},
"dependencies": {
"ponyfill-temporal": "workspace:*",
"tslib": "^2.8.1"
"tslib": "catalog:"
},
"devDependencies": {
"@macalinao/tsconfig": "^3.2.5",
"@types/bun": "latest",
"typescript": "^5.8.2"
"@macalinao/tsconfig": "catalog:",
"@types/bun": "catalog:",
"typescript": "catalog:"
}
}
8 changes: 4 additions & 4 deletions packages/interval-temporal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
},
"dependencies": {
"ponyfill-temporal": "workspace:*",
"tslib": "^2.8.1"
"tslib": "catalog:"
},
"devDependencies": {
"@macalinao/tsconfig": "^3.2.5",
"@types/bun": "latest",
"typescript": "^5.8.2"
"@macalinao/tsconfig": "catalog:",
"@types/bun": "catalog:",
"typescript": "catalog:"
}
}
8 changes: 4 additions & 4 deletions packages/parse-temporal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
},
"dependencies": {
"ponyfill-temporal": "workspace:*",
"tslib": "^2.8.1"
"tslib": "catalog:"
},
"devDependencies": {
"@macalinao/tsconfig": "^3.2.5",
"@types/bun": "latest",
"typescript": "^5.8.2"
"@macalinao/tsconfig": "catalog:",
"@types/bun": "catalog:",
"typescript": "catalog:"
}
}
12 changes: 6 additions & 6 deletions packages/ponyfill-temporal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@
"test": "bun test src/"
},
"dependencies": {
"temporal-polyfill": "^1.0.1",
"temporal-spec": "^1.0.0",
"tslib": "^2.8.1"
"temporal-polyfill": "catalog:",
"temporal-spec": "catalog:",
"tslib": "catalog:"
},
"devDependencies": {
"@macalinao/tsconfig": "^3.2.5",
"@types/bun": "latest",
"typescript": "^5.8.2"
"@macalinao/tsconfig": "catalog:",
"@types/bun": "catalog:",
"typescript": "catalog:"
}
}
8 changes: 4 additions & 4 deletions packages/superjson-temporal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@
},
"dependencies": {
"ponyfill-temporal": "workspace:*",
"tslib": "^2.8.1"
"tslib": "catalog:"
},
"devDependencies": {
"@macalinao/tsconfig": "^3.2.5",
"@types/bun": "latest",
"@macalinao/tsconfig": "catalog:",
"@types/bun": "catalog:",
"superjson": "^2.2.2",
"typescript": "^5.8.2"
"typescript": "catalog:"
},
"peerDependencies": {
"superjson": "^2.2.2"
Expand Down
8 changes: 4 additions & 4 deletions packages/temporal-quarter-fns/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
},
"dependencies": {
"ponyfill-temporal": "workspace:*",
"tslib": "^2.8.1"
"tslib": "catalog:"
},
"devDependencies": {
"@macalinao/tsconfig": "^3.2.5",
"@types/bun": "latest",
"typescript": "^5.8.2"
"@macalinao/tsconfig": "catalog:",
"@types/bun": "catalog:",
"typescript": "catalog:"
}
}
8 changes: 4 additions & 4 deletions packages/temporal-zod/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@
},
"dependencies": {
"ponyfill-temporal": "workspace:*",
"tslib": "^2.8.1"
"tslib": "catalog:"
},
"devDependencies": {
"@macalinao/tsconfig": "^3.2.5",
"@types/bun": "latest",
"@macalinao/tsconfig": "catalog:",
"@types/bun": "catalog:",
"ajv": "^8.18.0",
"ajv-formats": "^3.0.1",
"typescript": "^5.9.2",
"typescript": "catalog:",
"zod": "^4.1.11"
},
"peerDependencies": {
Expand Down
Loading