Skip to content

Commit e18e069

Browse files
AleksandrRogovAleksandrRogov
committed
moving v2 typescript branch to master
2 parents aa05a5f + 0de1075 commit e18e069

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+31972
-20761
lines changed

extra/paypal.png renamed to .github/extra/paypal.png

File renamed without changes.

‎.github/workflows/build-test-coverage.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
strategy:
1818
matrix:
19-
node-version: [14.x, 16.x, 18.x]
19+
node-version: [15.x, 16.x, 18.x]
2020

2121
steps:
2222
- uses: actions/checkout@v3
@@ -30,7 +30,7 @@ jobs:
3030
- run: npm test
3131
- name: Prepare coverage
3232
if: ${{ matrix.node-version == '16.x' }}
33-
run: npm run test-coverage
33+
run: npm run coverage
3434
- name: Publish to Coveralls
3535
if: ${{ matrix.node-version == '16.x' }}
3636
uses: coverallsapp/github-action@master

‎.gitignore‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -246,15 +246,13 @@ ModelManifest.xml
246246
# Vim
247247
*.sw[a-p]
248248

249-
/typings
250-
/gulpfile.js
251-
/typings.json
252-
/lib/test.js
253-
/scripts
254-
/coverage
255-
/tests/browser
256-
*.d.ts.map
249+
coverage/
257250
.nyc_output/
251+
typesold/
252+
253+
*.tgz
254+
lib/
255+
*.js.map
258256

259257
# Webstorm
260258
.idea

‎.mocharc.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
module.exports = {
2+
diff: true,
3+
extension: ["ts", "js"],
4+
require: "ts-node/register",
5+
spec: ["tests/*.spec.js", "tests/*.spec.ts"],
6+
};

‎.travis.yml‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎DynamicsWebApi.njsproj‎

Lines changed: 46 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88
<EnableTypeScript>true</EnableTypeScript>
99
<TypeScriptSourceMap>true</TypeScriptSourceMap>
1010
<TypeScriptModuleKind>CommonJS</TypeScriptModuleKind>
11-
<TypeScriptToolsVersion>2.3</TypeScriptToolsVersion>
11+
<TypeScriptToolsVersion>3.9</TypeScriptToolsVersion>
1212
<NodeExePath>
1313
</NodeExePath>
1414
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
15+
<ToolsVersionPromptShown>3.7</ToolsVersionPromptShown>
1516
</PropertyGroup>
1617
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1718
<PropertyGroup>
@@ -52,6 +53,7 @@
5253
</PropertyGroup>
5354
<ItemGroup>
5455
<Compile Include="lib\dwa.js" />
56+
<Compile Include="lib\dynamics-web-api-2.js" />
5557
<Compile Include="lib\dynamics-web-api-callbacks.js" />
5658
<Compile Include="lib\dynamics-web-api.js" />
5759
<Compile Include="lib\helpers\ErrorHelper.js">
@@ -63,41 +65,22 @@
6365
<Compile Include="lib\requests\helpers\parseResponse.js">
6466
<SubType>Code</SubType>
6567
</Compile>
66-
<Compile Include="lib\utilities\buildFunctionParameters.js">
67-
<SubType>Code</SubType>
68-
</Compile>
69-
<Compile Include="lib\polyfills\string-es6.js">
70-
<SubType>Code</SubType>
71-
</Compile>
7268
<Compile Include="lib\requests\helpers\dateReviver.js">
7369
<SubType>Code</SubType>
7470
</Compile>
7571
<Compile Include="lib\requests\helpers\parseResponseHeaders.js">
7672
<SubType>Code</SubType>
7773
</Compile>
7874
<Compile Include="lib\requests\http.js" />
75+
<Compile Include="lib\requests\RequestClient.js" />
7976
<Compile Include="lib\requests\xhr.js" />
80-
<Compile Include="lib\utilities\buildPreferHeader.js">
81-
<SubType>Code</SubType>
82-
</Compile>
83-
<Compile Include="lib\utilities\convertToReferenceObject.js">
84-
<SubType>Code</SubType>
85-
</Compile>
86-
<Compile Include="lib\utilities\getFetchXmlPagingCookie.js">
87-
<SubType>Code</SubType>
88-
</Compile>
89-
<Compile Include="lib\utilities\RequestConverter.js">
90-
<SubType>Code</SubType>
91-
</Compile>
92-
<Compile Include="lib\requests\sendRequest.js">
93-
<SubType>Code</SubType>
94-
</Compile>
77+
<Compile Include="lib\utilities\RequestUtility.js" />
9578
<Compile Include="lib\utilities\Utility.js">
9679
<SubType>Code</SubType>
9780
</Compile>
9881
<Compile Include="tests\browser\callbacks-tests.js" />
9982
<Compile Include="tests\browser\main-tests.js" />
100-
<Compile Include="tests\callbacks-tests.js">
83+
<Compile Include="tests\callbacks-tests-disabled.js">
10184
<TestFramework>
10285
</TestFramework>
10386
</Compile>
@@ -123,24 +106,60 @@
123106
</Content>
124107
<Content Include="package.json" />
125108
<Content Include="README.md" />
109+
<Content Include="tsconfig.json">
110+
<SubType>Code</SubType>
111+
</Content>
126112
</ItemGroup>
127113
<ItemGroup>
128114
<Folder Include="lib\" />
129115
<Folder Include="lib\helpers\" />
130116
<Folder Include="lib\utilities\" />
131-
<Folder Include="lib\polyfills\" />
132117
<Folder Include="lib\requests\" />
133118
<Folder Include="lib\requests\helpers\" />
134119
<Folder Include="dist\" />
135-
<Folder Include="types\" />
120+
<Folder Include="typesold\" />
121+
<Folder Include="ts\" />
136122
<Folder Include="tests\" />
137123
<Folder Include="tests\browser\" />
124+
<Folder Include="ts\helpers\" />
125+
<Folder Include="ts\requests\" />
126+
<Folder Include="ts\requests\helpers\" />
127+
<Folder Include="ts\utilities\" />
128+
<Folder Include="types\" />
138129
</ItemGroup>
139130
<ItemGroup>
140-
<TypeScriptCompile Include="types\dynamics-web-api.d.ts" />
141-
<TypeScriptCompile Include="types\dynamics-web-api-callbacks.d.ts">
131+
<TypeScriptCompile Include="lib\dynamics-web-api.d.ts" />
132+
<TypeScriptCompile Include="ts\dwa.ts" />
133+
<TypeScriptCompile Include="ts\dynamics-web-api.ts">
142134
<SubType>Code</SubType>
143135
</TypeScriptCompile>
136+
<TypeScriptCompile Include="ts\helpers\ErrorHelper.ts" />
137+
<TypeScriptCompile Include="ts\requests\helpers\dateReviver.ts">
138+
<SubType>Code</SubType>
139+
</TypeScriptCompile>
140+
<TypeScriptCompile Include="ts\requests\helpers\parseResponse.ts">
141+
<SubType>Code</SubType>
142+
</TypeScriptCompile>
143+
<TypeScriptCompile Include="ts\requests\helpers\parseResponseHeaders.ts">
144+
<SubType>Code</SubType>
145+
</TypeScriptCompile>
146+
<TypeScriptCompile Include="ts\requests\http.ts" />
147+
<TypeScriptCompile Include="ts\requests\RequestClient.ts" />
148+
<TypeScriptCompile Include="ts\requests\xhr.ts">
149+
<SubType>Code</SubType>
150+
</TypeScriptCompile>
151+
<TypeScriptCompile Include="ts\types.ts">
152+
<SubType>Code</SubType>
153+
</TypeScriptCompile>
154+
<TypeScriptCompile Include="ts\utilities\RequestUtility.ts" />
155+
<TypeScriptCompile Include="ts\utilities\Utility.ts">
156+
<SubType>Code</SubType>
157+
</TypeScriptCompile>
158+
<TypeScriptCompile Include="typesold\dynamics-web-api-callbacks.d.ts" />
159+
<TypeScriptCompile Include="types\dynamics-web-api-types.d.ts">
160+
<SubType>Code</SubType>
161+
</TypeScriptCompile>
162+
<TypeScriptCompile Include="types\dynamics-web-api.d.ts" />
144163
</ItemGroup>
145164
<!-- Do not delete the following Import Project. While this appears to do nothing it is a marker for setting TypeScript properties before our import that depends on them. -->
146165
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.targets" Condition="False" />

0 commit comments

Comments
 (0)