Skip to content

build: rename npm packages to @aws namespace #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
grant0417 merged 5 commits into from
Dec 12, 2024
Merged

build: rename npm packages to @aws namespace #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f8790af
abc
grant0417 Dec 4, 2024
2465695
Merge branch 'main' into rename-npm-namespace
grant0417 Dec 4, 2024
6a040fa
fix packages
grant0417 Dec 11, 2024
d027e9f
fix pnpm lock
grant0417 Dec 11, 2024
0f228d8
fmt fix
grant0417 Dec 11, 2024
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
2 changes: 1 addition & 1 deletion packages/api-bindings-wrappers/eslint.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// @ts-check
import base from "@amzn/fig-io-eslint-config/base";
import base from "@aws/amazon-q-developer-cli-eslint-config/base";
export default base({
tsconfigPath: "./tsconfig.json",
});
12 changes: 6 additions & 6 deletions packages/api-bindings-wrappers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@amzn/fig-io-api-bindings-wrappers",
"name": "@aws/amazon-q-developer-cli-api-bindings-wrappers",
Copy link
Member

@chaynabors chaynabors Dec 11, 2024

Choose a reason for hiding this comment

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

I would seriously prefer q-cli-api-bindings-wrappers instead of amazon-q-developer-cli-api-bindings-wrappers. Same with the other packages.

Copy link
Contributor Author

@grant0417 grant0417 Dec 11, 2024

Choose a reason for hiding this comment

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

this keeps the same prefix as the github repo name, it keeps it consistent but long

Copy link
Member

@chaynabors chaynabors Dec 11, 2024

Choose a reason for hiding this comment

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

Then we change the name of the repo

"version": "1.0.0",
"license": "MIT OR Apache-2.0",
"author": "Amazon Web Services",
Expand All @@ -22,14 +22,14 @@
"clean": "rm -rf dist"
},
"dependencies": {
"@amzn/fig-io-api-bindings": "workspace:~",
"@aws/amazon-q-developer-cli-api-bindings": "workspace:~",
"loglevel": "^1.9.2"
},
"devDependencies": {
"@amzn/fig-io-eslint-config": "workspace:^",
"@amzn/fig-io-shared": "workspace:^",
"@amzn/fig-io-tsconfig": "workspace:^",
"@amzn/fig-io-types": "workspace:^",
"@aws/amazon-q-developer-cli-eslint-config": "workspace:^",
"@aws/amazon-q-developer-cli-shared": "workspace:^",
"@aws/amazon-q-developer-cli-tsconfig": "workspace:^",
"@aws/amazon-q-developer-cli-types": "workspace:^",
"@withfig/autocomplete-types": "^1.31.0",
"eslint": "^9.16.0",
"prettier": "^3.4.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/api-bindings-wrappers/src/executeCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* If it gets bundled in the same file as the functions that call it
* vitest is not able to mock it (because of esm restrictions).
*/
import { withTimeout } from "@amzn/fig-io-shared/utils";
import { Process } from "@amzn/fig-io-api-bindings";
import { withTimeout } from "@aws/amazon-q-developer-cli-shared/utils";
import { Process } from "@aws/amazon-q-developer-cli-api-bindings";
import logger from "loglevel";

export const cleanOutput = (output: string) =>
Expand Down
6 changes: 3 additions & 3 deletions packages/api-bindings-wrappers/src/executeCommandWrappers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Process } from "@amzn/fig-io-api-bindings";
import { withTimeout } from "@amzn/fig-io-shared/utils";
import { createErrorInstance } from "@amzn/fig-io-shared/errors";
import { Process } from "@aws/amazon-q-developer-cli-api-bindings";
import { withTimeout } from "@aws/amazon-q-developer-cli-shared/utils";
import { createErrorInstance } from "@aws/amazon-q-developer-cli-shared/errors";
import logger from "loglevel";
import { cleanOutput, executeCommandTimeout } from "./executeCommand.js";
import { fread } from "./fs.js";
Expand Down
2 changes: 1 addition & 1 deletion packages/api-bindings-wrappers/src/fs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { fs as FileSystem } from "@amzn/fig-io-api-bindings";
import { fs as FileSystem } from "@aws/amazon-q-developer-cli-api-bindings";

export const fread = (path: string): Promise<string> =>
FileSystem.read(path).then((out) => out ?? "");
2 changes: 1 addition & 1 deletion packages/api-bindings-wrappers/src/state.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { State as DefaultState } from "@amzn/fig-io-api-bindings";
import { State as DefaultState } from "@aws/amazon-q-developer-cli-api-bindings";

export enum States {
DEVELOPER_API_HOST = "developer.apiHost",
Expand Down
9 changes: 6 additions & 3 deletions packages/api-bindings-wrappers/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
{
"extends": [
"@amzn/fig-io-tsconfig/base.json",
"@amzn/fig-io-tsconfig/dom.json"
"@aws/amazon-q-developer-cli-tsconfig/base.json",
"@aws/amazon-q-developer-cli-tsconfig/dom.json"
],
"compilerOptions": {
"outDir": "./dist",
"types": ["@withfig/autocomplete-types", "@amzn/fig-io-types"]
"types": [
"@withfig/autocomplete-types",
"@aws/amazon-q-developer-cli-types"
]
},
"include": ["src"]
}
4 changes: 2 additions & 2 deletions packages/api-bindings/codegen/generate-requests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ const project = new Project({
project.addSourceFilesAtPaths(join(__dirname, "../src/*.ts"));

const text = readFileSync(
"node_modules/@amzn/fig-io-proto/dist/fig.pb.ts",
"node_modules/@aws/amazon-q-developer-cli-proto/dist/fig.pb.ts",
"utf8",
);
const protobufBindings = project.createSourceFile("fig.pb.ts", text);
Expand Down Expand Up @@ -182,7 +182,7 @@ const sourceFile = project.createSourceFile(
.sort()
.map(capitalizeFirstLetter);
writer.writeLine(
`import { \n${imports.join(",\n")}\n } from "@amzn/fig-io-proto/fig";`,
`import { \n${imports.join(",\n")}\n } from "@aws/amazon-q-developer-cli-proto/fig";`,
);
writer.writeLine(`import { sendMessage } from "./core.js";`).blankLine();

Expand Down
2 changes: 1 addition & 1 deletion packages/api-bindings/eslint.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// @ts-check
import base from "@amzn/fig-io-eslint-config/base";
import base from "@aws/amazon-q-developer-cli-eslint-config/base";
export default base({
tsconfigPath: "./tsconfig.json",
});
8 changes: 4 additions & 4 deletions packages/api-bindings/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@amzn/fig-io-api-bindings",
"name": "@aws/amazon-q-developer-cli-api-bindings",
"version": "0.30.3",
"license": "MIT OR Apache-2.0",
"author": "Amazon Web Services",
Expand All @@ -21,11 +21,11 @@
"generate-requests": "tsx codegen/generate-requests.ts && prettier -w src/requests.ts"
},
"dependencies": {
"@amzn/fig-io-proto": "workspace:^"
"@aws/amazon-q-developer-cli-proto": "workspace:^"
},
"devDependencies": {
"@amzn/fig-io-eslint-config": "workspace:^",
"@amzn/fig-io-tsconfig": "workspace:^",
"@aws/amazon-q-developer-cli-eslint-config": "workspace:^",
"@aws/amazon-q-developer-cli-tsconfig": "workspace:^",
"@tsconfig/recommended": "^1.0.8",
"@types/node": "^22.10.1",
"@typescript/analyze-trace": "^0.10.1",
Expand Down
6 changes: 3 additions & 3 deletions packages/api-bindings/src/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
AuthStartPkceAuthorizationResponse,
AuthStatusResponse_AuthKind,
AuthBuilderIdPollCreateTokenResponse_PollStatus as PollStatus,
} from "@amzn/fig-io-proto/fig";
} from "@aws/amazon-q-developer-cli-proto/fig";
import {
sendAuthBuilderIdStartDeviceAuthorizationRequest,
sendAuthBuilderIdPollCreateTokenRequest,
Expand All @@ -13,8 +13,8 @@ import {
sendAuthStartPkceAuthorizationRequest,
sendAuthCancelPkceAuthorizationRequest,
} from "./requests.js";
import { AuthFinishPkceAuthorizationResponse } from "@amzn/fig-io-proto/fig";
import { AuthFinishPkceAuthorizationRequest } from "@amzn/fig-io-proto/fig";
import { AuthFinishPkceAuthorizationResponse } from "@aws/amazon-q-developer-cli-proto/fig";
import { AuthFinishPkceAuthorizationRequest } from "@aws/amazon-q-developer-cli-proto/fig";

export function status() {
return sendAuthStatusRequest({}).then((res) => {
Expand Down
2 changes: 1 addition & 1 deletion packages/api-bindings/src/codewhisperer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CodewhispererCustomization as Customization } from "@amzn/fig-io-proto/fig";
import { CodewhispererCustomization as Customization } from "@aws/amazon-q-developer-cli-proto/fig";
import { sendCodewhispererListCustomizationRequest } from "./requests.js";

const listCustomizations = async () =>
Expand Down
2 changes: 1 addition & 1 deletion packages/api-bindings/src/core.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {
ServerOriginatedMessage,
ClientOriginatedMessage,
} from "@amzn/fig-io-proto/fig";
} from "@aws/amazon-q-developer-cli-proto/fig";

import { b64ToBytes, bytesToBase64 } from "./utils.js";

Expand Down
2 changes: 1 addition & 1 deletion packages/api-bindings/src/editbuffer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {
EditBufferChangedNotification,
NotificationType,
} from "@amzn/fig-io-proto/fig";
} from "@aws/amazon-q-developer-cli-proto/fig";
import { _subscribe, NotificationResponse } from "./notifications.js";

export function subscribe(
Expand Down
2 changes: 1 addition & 1 deletion packages/api-bindings/src/event.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NotificationType } from "@amzn/fig-io-proto/fig";
import { NotificationType } from "@aws/amazon-q-developer-cli-proto/fig";
import { _subscribe, NotificationResponse } from "./notifications.js";

export function subscribe<T>(
Expand Down
2 changes: 1 addition & 1 deletion packages/api-bindings/src/history.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { HistoryQueryRequest_Param } from "@amzn/fig-io-proto/fig";
import { HistoryQueryRequest_Param } from "@aws/amazon-q-developer-cli-proto/fig";
import { sendHistoryQueryRequest } from "./requests.js";

export type Param = string | number | Uint8Array | null;
Expand Down
2 changes: 1 addition & 1 deletion packages/api-bindings/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as Fig from "@amzn/fig-io-proto/fig";
import * as Fig from "@aws/amazon-q-developer-cli-proto/fig";
import * as WindowPosition from "./position.js";
import * as Settings from "./settings.js";
import * as EditBufferNotifications from "./editbuffer.js";
Expand Down
2 changes: 1 addition & 1 deletion packages/api-bindings/src/install.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
InstallResponse_InstallationStatus,
NotificationType,
Result_Result,
} from "@amzn/fig-io-proto/fig";
} from "@aws/amazon-q-developer-cli-proto/fig";

import { sendInstallRequest } from "./requests.js";
import { NotificationResponse, _subscribe } from "./notifications.js";
Expand Down
2 changes: 1 addition & 1 deletion packages/api-bindings/src/keybindings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {
Action,
KeybindingPressedNotification,
NotificationType,
} from "@amzn/fig-io-proto/fig";
} from "@aws/amazon-q-developer-cli-proto/fig";
import { sendUpdateApplicationPropertiesRequest } from "./requests.js";
import { _subscribe, NotificationResponse } from "./notifications.js";

Expand Down
2 changes: 1 addition & 1 deletion packages/api-bindings/src/notifications.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
ServerOriginatedMessage,
NotificationRequest,
NotificationType,
} from "@amzn/fig-io-proto/fig";
} from "@aws/amazon-q-developer-cli-proto/fig";

import { sendMessage } from "./core.js";

Expand Down
4 changes: 2 additions & 2 deletions packages/api-bindings/src/platform.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { GetPlatformInfoResponse } from "@amzn/fig-io-proto/fig";
import { GetPlatformInfoResponse } from "@aws/amazon-q-developer-cli-proto/fig";
import { sendGetPlatformInfoRequest } from "./requests.js";
import {
AppBundleType,
DesktopEnvironment,
DisplayServerProtocol,
Os,
} from "@amzn/fig-io-proto/fig";
} from "@aws/amazon-q-developer-cli-proto/fig";

export { AppBundleType, DesktopEnvironment, DisplayServerProtocol, Os };

Expand Down
2 changes: 1 addition & 1 deletion packages/api-bindings/src/requests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ import {
UserLogoutRequest,
WindowFocusRequest,
WriteFileRequest,
} from "@amzn/fig-io-proto/fig";
} from "@aws/amazon-q-developer-cli-proto/fig";
import { sendMessage } from "./core.js";

export async function sendPositionWindowRequest(
Expand Down
2 changes: 1 addition & 1 deletion packages/api-bindings/src/settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {
SettingsChangedNotification,
NotificationType,
} from "@amzn/fig-io-proto/fig";
} from "@aws/amazon-q-developer-cli-proto/fig";
import { _subscribe, NotificationResponse } from "./notifications.js";

import {
Expand Down
2 changes: 1 addition & 1 deletion packages/api-bindings/src/shell.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
ShellPromptReturnedNotification,
TextUpdate,
HistoryUpdatedNotification,
} from "@amzn/fig-io-proto/fig";
} from "@aws/amazon-q-developer-cli-proto/fig";
import { sendInsertTextRequest } from "./requests.js";
import { _subscribe, NotificationResponse } from "./notifications.js";

Expand Down
2 changes: 1 addition & 1 deletion packages/api-bindings/src/state.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {
LocalStateChangedNotification,
NotificationType,
} from "@amzn/fig-io-proto/fig";
} from "@aws/amazon-q-developer-cli-proto/fig";
import { _subscribe, NotificationResponse } from "./notifications.js";

import {
Expand Down
2 changes: 1 addition & 1 deletion packages/api-bindings/src/telemetry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TelemetryProperty } from "@amzn/fig-io-proto/fig";
import { TelemetryProperty } from "@aws/amazon-q-developer-cli-proto/fig";
import {
sendTelemetryIdentifyRequest,
sendTelemetryPageRequest,
Expand Down
4 changes: 2 additions & 2 deletions packages/api-bindings/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"extends": [
"@amzn/fig-io-tsconfig/base.json",
"@amzn/fig-io-tsconfig/dom.json"
"@aws/amazon-q-developer-cli-tsconfig/base.json",
"@aws/amazon-q-developer-cli-tsconfig/dom.json"
],
"compilerOptions": {
"outDir": "dist"
Expand Down
2 changes: 1 addition & 1 deletion packages/autocomplete-parser/eslint.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// @ts-check
import base from "@amzn/fig-io-eslint-config/base";
import base from "@aws/amazon-q-developer-cli-eslint-config/base";
export default base({
tsconfigPath: "./tsconfig.eslint.json",
});
16 changes: 8 additions & 8 deletions packages/autocomplete-parser/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@amzn/fig-io-autocomplete-parser",
"name": "@aws/amazon-q-developer-cli-autocomplete-parser",
"version": "1.0.0",
"license": "MIT OR Apache-2.0",
"author": "Amazon Web Services",
Expand All @@ -20,20 +20,20 @@
"clean": "rm -rf dist"
},
"devDependencies": {
"@amzn/fig-io-eslint-config": "workspace:^",
"@amzn/fig-io-shared": "workspace:^",
"@amzn/fig-io-tsconfig": "workspace:^",
"@amzn/fig-io-types": "workspace:^",
"@aws/amazon-q-developer-cli-eslint-config": "workspace:^",
"@aws/amazon-q-developer-cli-shared": "workspace:^",
"@aws/amazon-q-developer-cli-tsconfig": "workspace:^",
"@aws/amazon-q-developer-cli-types": "workspace:^",
"@types/semver": "^7.5.8",
"@withfig/autocomplete-types": "^1.31.0",
"eslint": "^9.16.0",
"typescript": "^5.7.2",
"vitest": "^2.1.8"
},
"dependencies": {
"@amzn/fig-io-api-bindings": "workspace:~",
"@amzn/fig-io-api-bindings-wrappers": "workspace:^",
"@amzn/fig-io-shell-parser": "workspace:^",
"@aws/amazon-q-developer-cli-api-bindings": "workspace:~",
"@aws/amazon-q-developer-cli-api-bindings-wrappers": "workspace:^",
"@aws/amazon-q-developer-cli-shell-parser": "workspace:^",
"@fig/autocomplete-generators": "^2.4.0",
"@fig/autocomplete-helpers": "^1.0.7",
"@fig/autocomplete-shared": "^1.1.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/autocomplete-parser/src/caches.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { SpecMixin } from "@fig/autocomplete-shared";
import { Subcommand } from "@amzn/fig-io-shared/internal";
import { Subcommand } from "@aws/amazon-q-developer-cli-shared/internal";

const allCaches: Array<Map<string, unknown>> = [];

Expand Down
2 changes: 1 addition & 1 deletion packages/autocomplete-parser/src/errors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createErrorInstance } from "@amzn/fig-io-shared/errors";
import { createErrorInstance } from "@aws/amazon-q-developer-cli-shared/errors";

// LoadSpecErrors
export const MissingSpecError = createErrorInstance("MissingSpecError");
Expand Down
4 changes: 2 additions & 2 deletions packages/autocomplete-parser/src/loadHelpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import {
ensureTrailingSlash,
withTimeout,
exponentialBackoff,
} from "@amzn/fig-io-shared/utils";
} from "@aws/amazon-q-developer-cli-shared/utils";
import {
executeCommand,
fread,
isInDevMode,
} from "@amzn/fig-io-api-bindings-wrappers";
} from "@aws/amazon-q-developer-cli-api-bindings-wrappers";
import z from "zod";
import { MOST_USED_SPECS } from "./constants.js";
import { LoadLocalSpecError, SpecCDNError } from "./errors.js";
Expand Down
11 changes: 7 additions & 4 deletions packages/autocomplete-parser/src/loadSpec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
import logger, { Logger } from "loglevel";
import { Settings, Debugger } from "@amzn/fig-io-api-bindings";
import { Settings, Debugger } from "@aws/amazon-q-developer-cli-api-bindings";
import { convertSubcommand, initializeDefault } from "@fig/autocomplete-shared";
import {
withTimeout,
SpecLocationSource,
splitPath,
ensureTrailingSlash,
} from "@amzn/fig-io-shared/utils";
import { Subcommand, SpecLocation } from "@amzn/fig-io-shared/internal";
} from "@aws/amazon-q-developer-cli-shared/utils";
import {
Subcommand,
SpecLocation,
} from "@aws/amazon-q-developer-cli-shared/internal";
import {
SETTINGS,
getSetting,
executeCommand,
isInDevMode,
} from "@amzn/fig-io-api-bindings-wrappers";
} from "@aws/amazon-q-developer-cli-api-bindings-wrappers";
import {
importFromPublicCDN,
publicSpecExists,
Expand Down
Loading
Loading