Skip to content

Commit

Permalink
Address PR Comments
Browse files Browse the repository at this point in the history
  • Loading branch information
joheredi committed Feb 28, 2025
1 parent e857c8e commit 777c1de
Show file tree
Hide file tree
Showing 12 changed files with 57 additions and 546 deletions.
7 changes: 7 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,12 @@ packages/http-client-csharp/generator/TestProjects/**/tspCodeModel.json
packages/http-client-java/generator/http-client-generator-test/src/main/**/*.json
packages/http-client-java/generator/http-client-generator-clientcore-test/src/main/**/*.json

# auto generated http-client-js files
packages/http-client-js/test/e2e/generated/

# built test files for http-client-js
packages/http-client-js/dist-test


.gitattributes
CODEOWNERS
18 changes: 5 additions & 13 deletions .prettierrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,11 @@
}
},
{
"files": ["packages/http-client/**/*.tsx"],
"options": {
"parser": "alloy-ts"
}
},
{
"files": ["packages/http-client-js/**/*.tsx"],
"options": {
"parser": "alloy-ts"
}
},
{
"files": ["packages/emitter-framework/**/*.tsx"],
"files": [
"packages/http-client-js/**/*.tsx",
"packages/http-client/**/*.tsx",
"packages/emitter-framework/**/*.tsx"
],
"options": {
"parser": "alloy-ts"
}
Expand Down
6 changes: 0 additions & 6 deletions eng/common/pipelines/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,6 @@ extends:
DependsOn: InitStage
Condition: eq('true', stageDependencies.InitStage.outputs['InitJob.InitStep.RunPython'])

# Run javascript stages if RunJS == true
- template: /packages/http-client-js/eng/pipeline/templates/ci-stages.yml
parameters:
DependsOn: InitStage
Condition: eq('true', stageDependencies.InitStage.outputs['InitJob.InitStep.RunJS'])

# Run core stages if RunCore == true
- template: /eng/tsp-core/pipelines/stages/ci-stages.yml
parameters:
Expand Down
1 change: 0 additions & 1 deletion packages/http-client-js/.prettierignore

This file was deleted.

32 changes: 0 additions & 32 deletions packages/http-client-js/eng/pipeline/publish.yml

This file was deleted.

28 changes: 0 additions & 28 deletions packages/http-client-js/eng/pipeline/templates/ci-stages.yml

This file was deleted.

6 changes: 6 additions & 0 deletions packages/http-client-js/eng/scripts/emit-e2e.js
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,8 @@ async function processFiles(files, options) {

// Main logic.
(async () => {
const startTime = Date.now(); // Record start time

await clearLogDirectory(); // Clear the log directory at the start.

const ignoreList = await getIgnoreList();
Expand All @@ -311,4 +313,8 @@ async function processFiles(files, options) {
interactive: argv.interactive,
build: argv.build,
});

const endTime = Date.now(); // Record end time
const duration = (endTime - startTime) / 1000; // Calculate duration in seconds
console.log(chalk.blue(`Total time taken: ${duration} seconds`)); // Log duration
})();
12 changes: 1 addition & 11 deletions packages/http-client-js/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@typespec/http-client-js",
"version": "1.0.0",
"version": "0.1.0",
"type": "module",
"private": true,
"main": "dist/src/index.js",
Expand Down Expand Up @@ -33,9 +33,6 @@
"@typespec/emitter-framework": "workspace:~",
"@typespec/http": "workspace:~",
"@typespec/http-client": "workspace:~",
"@typespec/json-schema": "workspace:~",
"@typespec/openapi": "workspace:~",
"@typespec/openapi3": "workspace:~",
"@typespec/rest": "workspace:~"
},
"dependencies": {
Expand All @@ -45,11 +42,6 @@
},
"devDependencies": {
"@alloy-js/babel-preset": "^0.1.1",
"@azure-tools/cadl-ranch": "0.16.2",
"@azure-tools/cadl-ranch-expect": "0.15.7",
"@azure-tools/cadl-ranch-specs": "0.39.6",
"@azure-tools/typespec-azure-resource-manager": "0.49.0",
"@azure-tools/typespec-client-generator-core": "0.49.0",
"@babel/cli": "^7.24.8",
"@babel/core": "^7.26.0",
"@rollup/plugin-babel": "^6.0.4",
Expand All @@ -66,10 +58,8 @@
"fs-extra": "^11.2.0",
"globby": "~14.0.2",
"inquirer": "^12.2.0",
"listr2": "^8.2.5",
"ora": "^8.1.1",
"p-limit": "^6.2.0",
"ts-morph": "^23.0.0",
"typescript": "~5.7.3",
"uri-template": "^2.0.0",
"vitest": "^3.0.5",
Expand Down
2 changes: 2 additions & 0 deletions packages/http-client-js/src/components/http-response.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ export function HttpResponses(props: HttpResponsesProps) {
}
`;
}

return null;
},
{ joiner: "\n\n" },
);
Expand Down
7 changes: 1 addition & 6 deletions packages/http-client-js/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
{
"extends": "../../tsconfig.base.json",
"compilerOptions": {
"lib": ["es2023", "DOM"],
"module": "NodeNext",
"moduleResolution": "NodeNext",
"target": "es2022",
"strict": true,
"skipLibCheck": true,
"isolatedModules": true,
"declaration": true,
"sourceMap": true,
"declarationMap": true,
"jsx": "preserve",

"emitDeclarationOnly": true,
"outDir": "dist"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{
"scenariosMetadata": {
"commit": "f1c3ed823884d96e0f23810c4f605c2cc91909a1",
"commit": "e857c8e9c6764fb491743b925ee1b8129bd7a43b",
"version": "0.1.0-alpha.9",
"packageName": "@typespec/http-specs"
},
Expand Down Expand Up @@ -669,6 +669,6 @@
"Type_Model_Inheritance_SingleDiscriminator_getWrongDiscriminator": "pass",
"Type_Model_Inheritance_SingleDiscriminator_getLegacyModel": "pass"
},
"createdAt": "2025-02-27T05:35:52.983Z"
"createdAt": "2025-02-27T23:55:15.970Z"
}
]
Loading

0 comments on commit 777c1de

Please sign in to comment.