Move shared Go packages from libs/ to internal/
internal/ and libs/ were both shared-code roots with no rule for which
one a package belonged in, so the split carried no information. Adopt a
rule the language answers by itself:
shared Go -> internal/
shared TypeScript -> libs/ (npm workspace packages)
libs/{ports,repo,server} move to internal/, leaving libs/ holding only
the two TypeScript packages (@jobs-scraper/rabbitmq-ts and
@jobs-scraper/browser-automation), which matches npm workspace
convention. internal/ is also Go's marker for code not importable from
outside the repo, which is accurate here since none of it is published.
Import paths are rewritten mechanically (jobs-scraper/libs/ ->
jobs-scraper/internal/) across 15 lines in 10 files. The 6 moved files
are pure renames with no content change. Doing this after the module
collapse in the previous commit meant no go.mod or replace-directive
edits were needed.
gofmt is applied to services/api/pkg/http/job.go, whose import group the
rewrite left out of order. Three files were already unformatted before
this refactor (internal/openai/interface.go, internal/ports/job-queries.go,
internal/repo/job-analysis-result.go) and are deliberately left alone to
keep this diff limited to the move.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
fcbe2f04f9
commit
2ab810be72
17 changed files with 37 additions and 15 deletions
|
|
@ -12,7 +12,7 @@ import (
|
||||||
"github.com/jobs-scraper/internal/infrastructure/rabbitmq"
|
"github.com/jobs-scraper/internal/infrastructure/rabbitmq"
|
||||||
"github.com/jobs-scraper/internal/openai"
|
"github.com/jobs-scraper/internal/openai"
|
||||||
"github.com/jobs-scraper/internal/openrouter"
|
"github.com/jobs-scraper/internal/openrouter"
|
||||||
"github.com/jobs-scraper/libs/repo"
|
"github.com/jobs-scraper/internal/repo"
|
||||||
)
|
)
|
||||||
|
|
||||||
type JobAnalyzer struct {
|
type JobAnalyzer struct {
|
||||||
|
|
|
||||||
22
libs/README.md
Normal file
22
libs/README.md
Normal file
|
|
@ -0,0 +1,22 @@
|
||||||
|
# libs/ — shared TypeScript packages
|
||||||
|
|
||||||
|
This directory holds shared **TypeScript** packages only, consumed via npm
|
||||||
|
workspaces under the `@jobs-scraper/*` scope:
|
||||||
|
|
||||||
|
- `rabbitmq-ts` — `@jobs-scraper/rabbitmq-ts`
|
||||||
|
- `browser-automation` — `@jobs-scraper/browser-automation`
|
||||||
|
|
||||||
|
**Shared Go code goes in `internal/`, not here.** There is one shared root per
|
||||||
|
language, so the language answers the "which directory?" question and there is
|
||||||
|
nothing further to remember:
|
||||||
|
|
||||||
|
| Shared code | Lives in |
|
||||||
|
| --- | --- |
|
||||||
|
| Go | `internal/` (part of the root `github.com/jobs-scraper` module) |
|
||||||
|
| TypeScript | `libs/` (npm workspace packages) |
|
||||||
|
|
||||||
|
`internal/` is also Go's own marker for code that is not importable from outside
|
||||||
|
this repository, which is accurate — none of it is published.
|
||||||
|
|
||||||
|
Deployable units — the API, the scrapers, the cron app — live in `services/`
|
||||||
|
and `apps/` and each own their own Go module or `package.json`.
|
||||||
|
|
@ -12,7 +12,7 @@ import (
|
||||||
"github.com/gorilla/mux"
|
"github.com/gorilla/mux"
|
||||||
"github.com/jobs-scraper/internal/infrastructure"
|
"github.com/jobs-scraper/internal/infrastructure"
|
||||||
"github.com/jobs-scraper/internal/infrastructure/rabbitmq"
|
"github.com/jobs-scraper/internal/infrastructure/rabbitmq"
|
||||||
"github.com/jobs-scraper/libs/repo"
|
"github.com/jobs-scraper/internal/repo"
|
||||||
"github.com/jobs-scraper/services/api/internal/app"
|
"github.com/jobs-scraper/services/api/internal/app"
|
||||||
httpHandler "github.com/jobs-scraper/services/api/pkg/http"
|
httpHandler "github.com/jobs-scraper/services/api/pkg/http"
|
||||||
_ "github.com/jobs-scraper/services/api/pkg/swagger"
|
_ "github.com/jobs-scraper/services/api/pkg/swagger"
|
||||||
|
|
|
||||||
|
|
@ -5,9 +5,9 @@ import (
|
||||||
|
|
||||||
"github.com/gorilla/mux"
|
"github.com/gorilla/mux"
|
||||||
"github.com/jobs-scraper/internal/infrastructure/rabbitmq"
|
"github.com/jobs-scraper/internal/infrastructure/rabbitmq"
|
||||||
"github.com/jobs-scraper/libs/ports"
|
"github.com/jobs-scraper/internal/ports"
|
||||||
"github.com/jobs-scraper/libs/repo"
|
"github.com/jobs-scraper/internal/repo"
|
||||||
"github.com/jobs-scraper/libs/server"
|
"github.com/jobs-scraper/internal/server"
|
||||||
jobCommands "github.com/jobs-scraper/services/api/internal/commands/job"
|
jobCommands "github.com/jobs-scraper/services/api/internal/commands/job"
|
||||||
jobQueries "github.com/jobs-scraper/services/api/internal/queries/job"
|
jobQueries "github.com/jobs-scraper/services/api/internal/queries/job"
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ import (
|
||||||
|
|
||||||
"github.com/jobs-scraper/internal/dto"
|
"github.com/jobs-scraper/internal/dto"
|
||||||
"github.com/jobs-scraper/internal/infrastructure/rabbitmq"
|
"github.com/jobs-scraper/internal/infrastructure/rabbitmq"
|
||||||
"github.com/jobs-scraper/libs/repo"
|
"github.com/jobs-scraper/internal/repo"
|
||||||
)
|
)
|
||||||
|
|
||||||
type ApplyForJob struct {
|
type ApplyForJob struct {
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,8 @@ import (
|
||||||
|
|
||||||
"github.com/jobs-scraper/internal/domain"
|
"github.com/jobs-scraper/internal/domain"
|
||||||
"github.com/jobs-scraper/internal/infrastructure/rabbitmq"
|
"github.com/jobs-scraper/internal/infrastructure/rabbitmq"
|
||||||
"github.com/jobs-scraper/libs/ports"
|
"github.com/jobs-scraper/internal/ports"
|
||||||
"github.com/jobs-scraper/libs/repo"
|
"github.com/jobs-scraper/internal/repo"
|
||||||
)
|
)
|
||||||
|
|
||||||
type CreateJob struct {
|
type CreateJob struct {
|
||||||
|
|
|
||||||
|
|
@ -2,8 +2,8 @@ package job
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/jobs-scraper/internal/dto"
|
"github.com/jobs-scraper/internal/dto"
|
||||||
"github.com/jobs-scraper/libs/ports"
|
"github.com/jobs-scraper/internal/ports"
|
||||||
"github.com/jobs-scraper/libs/repo"
|
"github.com/jobs-scraper/internal/repo"
|
||||||
)
|
)
|
||||||
|
|
||||||
type GetJobs struct {
|
type GetJobs struct {
|
||||||
|
|
|
||||||
|
|
@ -9,9 +9,9 @@ import (
|
||||||
|
|
||||||
"github.com/gorilla/mux"
|
"github.com/gorilla/mux"
|
||||||
"github.com/gorilla/schema"
|
"github.com/gorilla/schema"
|
||||||
|
"github.com/jobs-scraper/internal/ports"
|
||||||
|
"github.com/jobs-scraper/internal/repo"
|
||||||
"github.com/jobs-scraper/internal/utils"
|
"github.com/jobs-scraper/internal/utils"
|
||||||
"github.com/jobs-scraper/libs/ports"
|
|
||||||
"github.com/jobs-scraper/libs/repo"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// JobHandler handles HTTP requests related to jobs
|
// JobHandler handles HTTP requests related to jobs
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ import (
|
||||||
|
|
||||||
"github.com/jobs-scraper/internal/browser"
|
"github.com/jobs-scraper/internal/browser"
|
||||||
"github.com/jobs-scraper/internal/domain"
|
"github.com/jobs-scraper/internal/domain"
|
||||||
"github.com/jobs-scraper/libs/repo"
|
"github.com/jobs-scraper/internal/repo"
|
||||||
"github.com/jobs-scraper/services/scraper-google/analyzer"
|
"github.com/jobs-scraper/services/scraper-google/analyzer"
|
||||||
si "github.com/jobs-scraper/services/scraper-google/setup-infrastructure"
|
si "github.com/jobs-scraper/services/scraper-google/setup-infrastructure"
|
||||||
"github.com/jobs-scraper/services/scraper-google/utils"
|
"github.com/jobs-scraper/services/scraper-google/utils"
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ import (
|
||||||
"github.com/jobs-scraper/internal/domain"
|
"github.com/jobs-scraper/internal/domain"
|
||||||
"github.com/jobs-scraper/internal/infrastructure"
|
"github.com/jobs-scraper/internal/infrastructure"
|
||||||
"github.com/jobs-scraper/internal/infrastructure/rabbitmq"
|
"github.com/jobs-scraper/internal/infrastructure/rabbitmq"
|
||||||
"github.com/jobs-scraper/libs/repo"
|
"github.com/jobs-scraper/internal/repo"
|
||||||
"github.com/jobs-scraper/services/scraper/pipeline"
|
"github.com/jobs-scraper/services/scraper/pipeline"
|
||||||
"github.com/joho/godotenv"
|
"github.com/joho/godotenv"
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/jobs-scraper/internal/domain"
|
"github.com/jobs-scraper/internal/domain"
|
||||||
"github.com/jobs-scraper/libs/repo"
|
"github.com/jobs-scraper/internal/repo"
|
||||||
)
|
)
|
||||||
|
|
||||||
// JobDescriptionResult represents the result of job description scraping
|
// JobDescriptionResult represents the result of job description scraping
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue