typescript-node: clean up require and import - #6947

Merged
wing328 merged 8 commits into
OpenAPITools:masterfrom
laubfall:typescript-node_mixes_require_and_import_4656
Jul 31, 2020
Merged

typescript-node: clean up require and import#6947
wing328 merged 8 commits into
OpenAPITools:masterfrom
laubfall:typescript-node_mixes_require_and_import_4656

Conversation

@laubfall

@laubfalllaubfall commented Jul 15, 2020

Copy link
Copy Markdown
Contributor

… instead of import statement

PR checklist

  • Read the contribution guidelines.
  • If contributing template-only or documentation-only changes which will change sample output, build the project beforehand.
  • Run the shell script ./bin/generate-samples.shto update all Petstore samples related to your fix. This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master. These must match the expectations made by your contribution. You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/config/java*. For Windows users, please run the script in Git BASH.
  • File the PR against the correct branch: master
  • Copy the technical committee to review the pull request if your PR is targeting a particular programming language.

@TiFu (2017/07) @taxpon (2017/07) @sebastianhaas (2017/07) @kenisteward (2017/07) @Vrolijkx (2017/09) @macjohnny (2018/01) @topce (2018/10) @akehir (2019/07) @petejohansonxo (2019/11) @amakhrov (2020/02)

@macjohnnymacjohnny changed the title Typescript node mixes require and import 4656typescript-node: clean up require and importJul 15, 2020

@macjohnnymacjohnny left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@macjohnnymacjohnny added this to the 5.0.0 milestone Jul 15, 2020
import http from 'http';
{{/supportsES6}}
{{^supportsES6}}
import localVarRequest = require('request');

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The import var = require does not make much sense to me. This should be probably const localVarRequest = require('request').

Or did I oversee something?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Same for the other parts.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Yeah thats right, i'll fix it :)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I'm getting some typescript errors with const http = require. These are "TS2503: Cannot find namespace 'http'." and "error TS4055: Return type of public method from exported class has or is using private name 'http'.". As described here: https://stackoverflow.com/questions/31173738/typescript-getting-error-ts2304-cannot-find-name-require there are some ways to make this work, but to be honest i don't see a reason why to make a difference at this point. All other modules are imported with the "import .. from" stmt independent of the ES6 flag. So i removed the switch and changed the tsconfig to make the imports http/request work. What do you think about this solution?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

For TypeScript to use these you need the types for the Nodejs internal ones. Basically @types/node.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The current solution should be fine.

@DanielRuf

Copy link
Copy Markdown
Contributor
  • [ x]

You might want to remove the space inside the square brackets (it is either a space or x as single character) ;-)

@macjohnny

Copy link
Copy Markdown
Member

@laubfall could you please fix the CI issues?

@DanielRufDanielRuf left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

See my remarks / comments =)

@wing328

Copy link
Copy Markdown
Member

Thanks for the PR but your commit (as shown in the Commits tab) is not linked to your Github account, which means this PR won't count as your contribution in https://github.com/OpenAPITools/openapi-generator/graphs/contributors.

Let me know if you need help fixing it.

Ref: https://github.com/OpenAPITools/openapi-generator/wiki/FAQ#how-can-i-update-commits-that-are-not-linked-to-my-github-account

@wing328

Copy link
Copy Markdown
Member

I just pushed 547e305 to fix the CI failure. Let's see how that goes.

model/pet.ts
model/tag.ts
model/user.ts
model/./apiResponse.ts

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why this change? ./ makes not much sense in my opinion.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Agreed ./ is not needed. We'll tackle it separately.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Ok, so there is nothing left here to todo for the PR?

@laubfall

laubfall commented Jul 31, 2020

Copy link
Copy Markdown
ContributorAuthor

I just pushed 547e305 to fix the CI failure. Let's see how that goes.

Thanks, i looked into the CI Failure but did not saw the reason why the build failed

@wing328

Copy link
Copy Markdown
Member

Shippable CI failure not related to this PR.

@wing328
wing328 merged commit b838e18 into OpenAPITools:masterJul 31, 2020
jimschubert added a commit that referenced this pull request Aug 3, 2020
* master: (121 commits)
[PowerShell] better publishing workflow (#7114)
[aspnetcore] Typo issues in docs and generated code (#7094)
fix http signaure auth in build.sbt (#7110)
fix for the issue facing spec invlolving arrayschema structure with ref (#6310)
[csharp-netcore] added cancellation tokens to async calls (#7077)
[PS] Allow CI to publish the module (#7091)
[Dart] Treat float as double (#6924)
[Java][jersey2]Fix gradle HttpSignatureAuth dependencies (#7096)
move maven,gradle tests to shipppable ci (#7108)
[MARKDOWN] Fix issue 6089 with property and parameter names (#6105)
[BUG] Multi-Part content type in response ignores properties of composed schema (allOf/oneOf) (#6073)
[online] Fix for version conflicts with springfox/boot (#7102)
skip some installations to shorten build time
[Go][Exp] better code format (#7088)
Fix Shippable CI (#7097)
typescript-node: clean up require and import (#6947)
commented out perl, bash tests to reduce build time
Add a link to conference paper (#7086)
Add a link to the blog post at qiita (#7084)
migrate typescript.sh to new config format (#7078)
...
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG] typescript-node mixes require and import

4 participants

@laubfall@DanielRuf@macjohnny@wing328
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

typescript-node: clean up require and import - #6947

Merged
wing328 merged 8 commits into
OpenAPITools:masterfrom
laubfall:typescript-node_mixes_require_and_import_4656
Jul 31, 2020
Merged

typescript-node: clean up require and import#6947
wing328 merged 8 commits into
OpenAPITools:masterfrom
laubfall:typescript-node_mixes_require_and_import_4656

Conversation

@laubfall

@laubfalllaubfall commented Jul 15, 2020

Copy link
Copy Markdown
Contributor

… instead of import statement

PR checklist

  • Read the contribution guidelines.
  • If contributing template-only or documentation-only changes which will change sample output, build the project beforehand.
  • Run the shell script ./bin/generate-samples.shto update all Petstore samples related to your fix. This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master. These must match the expectations made by your contribution. You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/config/java*. For Windows users, please run the script in Git BASH.
  • File the PR against the correct branch: master
  • Copy the technical committee to review the pull request if your PR is targeting a particular programming language.

@TiFu (2017/07) @taxpon (2017/07) @sebastianhaas (2017/07) @kenisteward (2017/07) @Vrolijkx (2017/09) @macjohnny (2018/01) @topce (2018/10) @akehir (2019/07) @petejohansonxo (2019/11) @amakhrov (2020/02)

@macjohnnymacjohnny changed the title Typescript node mixes require and import 4656typescript-node: clean up require and importJul 15, 2020

@macjohnnymacjohnny left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@macjohnnymacjohnny added this to the 5.0.0 milestone Jul 15, 2020
import http from 'http';
{{/supportsES6}}
{{^supportsES6}}
import localVarRequest = require('request');

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The import var = require does not make much sense to me. This should be probably const localVarRequest = require('request').

Or did I oversee something?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Same for the other parts.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Yeah thats right, i'll fix it :)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I'm getting some typescript errors with const http = require. These are "TS2503: Cannot find namespace 'http'." and "error TS4055: Return type of public method from exported class has or is using private name 'http'.". As described here: https://stackoverflow.com/questions/31173738/typescript-getting-error-ts2304-cannot-find-name-require there are some ways to make this work, but to be honest i don't see a reason why to make a difference at this point. All other modules are imported with the "import .. from" stmt independent of the ES6 flag. So i removed the switch and changed the tsconfig to make the imports http/request work. What do you think about this solution?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

For TypeScript to use these you need the types for the Nodejs internal ones. Basically @types/node.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The current solution should be fine.

@DanielRuf

Copy link
Copy Markdown
Contributor
  • [ x]

You might want to remove the space inside the square brackets (it is either a space or x as single character) ;-)

@macjohnny

Copy link
Copy Markdown
Member

@laubfall could you please fix the CI issues?

@DanielRufDanielRuf left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

See my remarks / comments =)

@wing328

Copy link
Copy Markdown
Member

Thanks for the PR but your commit (as shown in the Commits tab) is not linked to your Github account, which means this PR won't count as your contribution in https://github.com/OpenAPITools/openapi-generator/graphs/contributors.

Let me know if you need help fixing it.

Ref: https://github.com/OpenAPITools/openapi-generator/wiki/FAQ#how-can-i-update-commits-that-are-not-linked-to-my-github-account

@wing328

Copy link
Copy Markdown
Member

I just pushed 547e305 to fix the CI failure. Let's see how that goes.

model/pet.ts
model/tag.ts
model/user.ts
model/./apiResponse.ts

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why this change? ./ makes not much sense in my opinion.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Agreed ./ is not needed. We'll tackle it separately.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Ok, so there is nothing left here to todo for the PR?

@laubfall

laubfall commented Jul 31, 2020

Copy link
Copy Markdown
ContributorAuthor

I just pushed 547e305 to fix the CI failure. Let's see how that goes.

Thanks, i looked into the CI Failure but did not saw the reason why the build failed

@wing328

Copy link
Copy Markdown
Member

Shippable CI failure not related to this PR.

@wing328
wing328 merged commit b838e18 into OpenAPITools:masterJul 31, 2020
jimschubert added a commit that referenced this pull request Aug 3, 2020
* master: (121 commits)
[PowerShell] better publishing workflow (#7114)
[aspnetcore] Typo issues in docs and generated code (#7094)
fix http signaure auth in build.sbt (#7110)
fix for the issue facing spec invlolving arrayschema structure with ref (#6310)
[csharp-netcore] added cancellation tokens to async calls (#7077)
[PS] Allow CI to publish the module (#7091)
[Dart] Treat float as double (#6924)
[Java][jersey2]Fix gradle HttpSignatureAuth dependencies (#7096)
move maven,gradle tests to shipppable ci (#7108)
[MARKDOWN] Fix issue 6089 with property and parameter names (#6105)
[BUG] Multi-Part content type in response ignores properties of composed schema (allOf/oneOf) (#6073)
[online] Fix for version conflicts with springfox/boot (#7102)
skip some installations to shorten build time
[Go][Exp] better code format (#7088)
Fix Shippable CI (#7097)
typescript-node: clean up require and import (#6947)
commented out perl, bash tests to reduce build time
Add a link to conference paper (#7086)
Add a link to the blog post at qiita (#7084)
migrate typescript.sh to new config format (#7078)
...
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG] typescript-node mixes require and import

4 participants

@laubfall@DanielRuf@macjohnny@wing328
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

typescript-node: clean up require and import - #6947

Merged
wing328 merged 8 commits into
OpenAPITools:masterfrom
laubfall:typescript-node_mixes_require_and_import_4656
Jul 31, 2020
Merged

typescript-node: clean up require and import#6947
wing328 merged 8 commits into
OpenAPITools:masterfrom
laubfall:typescript-node_mixes_require_and_import_4656

Conversation

@laubfall

@laubfalllaubfall commented Jul 15, 2020

Copy link
Copy Markdown
Contributor

… instead of import statement

PR checklist

  • Read the contribution guidelines.
  • If contributing template-only or documentation-only changes which will change sample output, build the project beforehand.
  • Run the shell script ./bin/generate-samples.shto update all Petstore samples related to your fix. This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master. These must match the expectations made by your contribution. You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/config/java*. For Windows users, please run the script in Git BASH.
  • File the PR against the correct branch: master
  • Copy the technical committee to review the pull request if your PR is targeting a particular programming language.

@TiFu (2017/07) @taxpon (2017/07) @sebastianhaas (2017/07) @kenisteward (2017/07) @Vrolijkx (2017/09) @macjohnny (2018/01) @topce (2018/10) @akehir (2019/07) @petejohansonxo (2019/11) @amakhrov (2020/02)

@macjohnnymacjohnny changed the title Typescript node mixes require and import 4656typescript-node: clean up require and importJul 15, 2020

@macjohnnymacjohnny left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@macjohnnymacjohnny added this to the 5.0.0 milestone Jul 15, 2020
import http from 'http';
{{/supportsES6}}
{{^supportsES6}}
import localVarRequest = require('request');

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The import var = require does not make much sense to me. This should be probably const localVarRequest = require('request').

Or did I oversee something?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Same for the other parts.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Yeah thats right, i'll fix it :)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I'm getting some typescript errors with const http = require. These are "TS2503: Cannot find namespace 'http'." and "error TS4055: Return type of public method from exported class has or is using private name 'http'.". As described here: https://stackoverflow.com/questions/31173738/typescript-getting-error-ts2304-cannot-find-name-require there are some ways to make this work, but to be honest i don't see a reason why to make a difference at this point. All other modules are imported with the "import .. from" stmt independent of the ES6 flag. So i removed the switch and changed the tsconfig to make the imports http/request work. What do you think about this solution?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

For TypeScript to use these you need the types for the Nodejs internal ones. Basically @types/node.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The current solution should be fine.

@DanielRuf

Copy link
Copy Markdown
Contributor
  • [ x]

You might want to remove the space inside the square brackets (it is either a space or x as single character) ;-)

@macjohnny

Copy link
Copy Markdown
Member

@laubfall could you please fix the CI issues?

@DanielRufDanielRuf left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

See my remarks / comments =)

@wing328

Copy link
Copy Markdown
Member

Thanks for the PR but your commit (as shown in the Commits tab) is not linked to your Github account, which means this PR won't count as your contribution in https://github.com/OpenAPITools/openapi-generator/graphs/contributors.

Let me know if you need help fixing it.

Ref: https://github.com/OpenAPITools/openapi-generator/wiki/FAQ#how-can-i-update-commits-that-are-not-linked-to-my-github-account

@wing328

Copy link
Copy Markdown
Member

I just pushed 547e305 to fix the CI failure. Let's see how that goes.

model/pet.ts
model/tag.ts
model/user.ts
model/./apiResponse.ts

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why this change? ./ makes not much sense in my opinion.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Agreed ./ is not needed. We'll tackle it separately.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Ok, so there is nothing left here to todo for the PR?

@laubfall

laubfall commented Jul 31, 2020

Copy link
Copy Markdown
ContributorAuthor

I just pushed 547e305 to fix the CI failure. Let's see how that goes.

Thanks, i looked into the CI Failure but did not saw the reason why the build failed

@wing328

Copy link
Copy Markdown
Member

Shippable CI failure not related to this PR.

@wing328
wing328 merged commit b838e18 into OpenAPITools:masterJul 31, 2020
jimschubert added a commit that referenced this pull request Aug 3, 2020
* master: (121 commits)
[PowerShell] better publishing workflow (#7114)
[aspnetcore] Typo issues in docs and generated code (#7094)
fix http signaure auth in build.sbt (#7110)
fix for the issue facing spec invlolving arrayschema structure with ref (#6310)
[csharp-netcore] added cancellation tokens to async calls (#7077)
[PS] Allow CI to publish the module (#7091)
[Dart] Treat float as double (#6924)
[Java][jersey2]Fix gradle HttpSignatureAuth dependencies (#7096)
move maven,gradle tests to shipppable ci (#7108)
[MARKDOWN] Fix issue 6089 with property and parameter names (#6105)
[BUG] Multi-Part content type in response ignores properties of composed schema (allOf/oneOf) (#6073)
[online] Fix for version conflicts with springfox/boot (#7102)
skip some installations to shorten build time
[Go][Exp] better code format (#7088)
Fix Shippable CI (#7097)
typescript-node: clean up require and import (#6947)
commented out perl, bash tests to reduce build time
Add a link to conference paper (#7086)
Add a link to the blog post at qiita (#7084)
migrate typescript.sh to new config format (#7078)
...
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG] typescript-node mixes require and import

4 participants

@laubfall@DanielRuf@macjohnny@wing328
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

typescript-node: clean up require and import - #6947

Merged
wing328 merged 8 commits into
OpenAPITools:masterfrom
laubfall:typescript-node_mixes_require_and_import_4656
Jul 31, 2020
Merged

typescript-node: clean up require and import#6947
wing328 merged 8 commits into
OpenAPITools:masterfrom
laubfall:typescript-node_mixes_require_and_import_4656

Conversation

@laubfall

@laubfalllaubfall commented Jul 15, 2020

Copy link
Copy Markdown
Contributor

… instead of import statement

PR checklist

  • Read the contribution guidelines.
  • If contributing template-only or documentation-only changes which will change sample output, build the project beforehand.
  • Run the shell script ./bin/generate-samples.shto update all Petstore samples related to your fix. This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master. These must match the expectations made by your contribution. You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/config/java*. For Windows users, please run the script in Git BASH.
  • File the PR against the correct branch: master
  • Copy the technical committee to review the pull request if your PR is targeting a particular programming language.

@TiFu (2017/07) @taxpon (2017/07) @sebastianhaas (2017/07) @kenisteward (2017/07) @Vrolijkx (2017/09) @macjohnny (2018/01) @topce (2018/10) @akehir (2019/07) @petejohansonxo (2019/11) @amakhrov (2020/02)

@macjohnnymacjohnny changed the title Typescript node mixes require and import 4656typescript-node: clean up require and importJul 15, 2020

@macjohnnymacjohnny left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@macjohnnymacjohnny added this to the 5.0.0 milestone Jul 15, 2020
import http from 'http';
{{/supportsES6}}
{{^supportsES6}}
import localVarRequest = require('request');

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The import var = require does not make much sense to me. This should be probably const localVarRequest = require('request').

Or did I oversee something?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Same for the other parts.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Yeah thats right, i'll fix it :)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I'm getting some typescript errors with const http = require. These are "TS2503: Cannot find namespace 'http'." and "error TS4055: Return type of public method from exported class has or is using private name 'http'.". As described here: https://stackoverflow.com/questions/31173738/typescript-getting-error-ts2304-cannot-find-name-require there are some ways to make this work, but to be honest i don't see a reason why to make a difference at this point. All other modules are imported with the "import .. from" stmt independent of the ES6 flag. So i removed the switch and changed the tsconfig to make the imports http/request work. What do you think about this solution?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

For TypeScript to use these you need the types for the Nodejs internal ones. Basically @types/node.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The current solution should be fine.

@DanielRuf

Copy link
Copy Markdown
Contributor
  • [ x]

You might want to remove the space inside the square brackets (it is either a space or x as single character) ;-)

@macjohnny

Copy link
Copy Markdown
Member

@laubfall could you please fix the CI issues?

@DanielRufDanielRuf left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

See my remarks / comments =)

@wing328

Copy link
Copy Markdown
Member

Thanks for the PR but your commit (as shown in the Commits tab) is not linked to your Github account, which means this PR won't count as your contribution in https://github.com/OpenAPITools/openapi-generator/graphs/contributors.

Let me know if you need help fixing it.

Ref: https://github.com/OpenAPITools/openapi-generator/wiki/FAQ#how-can-i-update-commits-that-are-not-linked-to-my-github-account

@wing328

Copy link
Copy Markdown
Member

I just pushed 547e305 to fix the CI failure. Let's see how that goes.

model/pet.ts
model/tag.ts
model/user.ts
model/./apiResponse.ts

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why this change? ./ makes not much sense in my opinion.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Agreed ./ is not needed. We'll tackle it separately.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Ok, so there is nothing left here to todo for the PR?

@laubfall

laubfall commented Jul 31, 2020

Copy link
Copy Markdown
ContributorAuthor

I just pushed 547e305 to fix the CI failure. Let's see how that goes.

Thanks, i looked into the CI Failure but did not saw the reason why the build failed

@wing328

Copy link
Copy Markdown
Member

Shippable CI failure not related to this PR.

@wing328
wing328 merged commit b838e18 into OpenAPITools:masterJul 31, 2020
jimschubert added a commit that referenced this pull request Aug 3, 2020
* master: (121 commits)
[PowerShell] better publishing workflow (#7114)
[aspnetcore] Typo issues in docs and generated code (#7094)
fix http signaure auth in build.sbt (#7110)
fix for the issue facing spec invlolving arrayschema structure with ref (#6310)
[csharp-netcore] added cancellation tokens to async calls (#7077)
[PS] Allow CI to publish the module (#7091)
[Dart] Treat float as double (#6924)
[Java][jersey2]Fix gradle HttpSignatureAuth dependencies (#7096)
move maven,gradle tests to shipppable ci (#7108)
[MARKDOWN] Fix issue 6089 with property and parameter names (#6105)
[BUG] Multi-Part content type in response ignores properties of composed schema (allOf/oneOf) (#6073)
[online] Fix for version conflicts with springfox/boot (#7102)
skip some installations to shorten build time
[Go][Exp] better code format (#7088)
Fix Shippable CI (#7097)
typescript-node: clean up require and import (#6947)
commented out perl, bash tests to reduce build time
Add a link to conference paper (#7086)
Add a link to the blog post at qiita (#7084)
migrate typescript.sh to new config format (#7078)
...
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG] typescript-node mixes require and import

4 participants

@laubfall@DanielRuf@macjohnny@wing328
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

typescript-node: clean up require and import - #6947

Merged
wing328 merged 8 commits into
OpenAPITools:masterfrom
laubfall:typescript-node_mixes_require_and_import_4656
Jul 31, 2020
Merged

typescript-node: clean up require and import#6947
wing328 merged 8 commits into
OpenAPITools:masterfrom
laubfall:typescript-node_mixes_require_and_import_4656

Conversation

@laubfall

@laubfalllaubfall commented Jul 15, 2020

Copy link
Copy Markdown
Contributor

… instead of import statement

PR checklist

  • Read the contribution guidelines.
  • If contributing template-only or documentation-only changes which will change sample output, build the project beforehand.
  • Run the shell script ./bin/generate-samples.shto update all Petstore samples related to your fix. This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master. These must match the expectations made by your contribution. You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/config/java*. For Windows users, please run the script in Git BASH.
  • File the PR against the correct branch: master
  • Copy the technical committee to review the pull request if your PR is targeting a particular programming language.

@TiFu (2017/07) @taxpon (2017/07) @sebastianhaas (2017/07) @kenisteward (2017/07) @Vrolijkx (2017/09) @macjohnny (2018/01) @topce (2018/10) @akehir (2019/07) @petejohansonxo (2019/11) @amakhrov (2020/02)

@macjohnnymacjohnny changed the title Typescript node mixes require and import 4656typescript-node: clean up require and importJul 15, 2020

@macjohnnymacjohnny left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@macjohnnymacjohnny added this to the 5.0.0 milestone Jul 15, 2020
import http from 'http';
{{/supportsES6}}
{{^supportsES6}}
import localVarRequest = require('request');

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The import var = require does not make much sense to me. This should be probably const localVarRequest = require('request').

Or did I oversee something?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Same for the other parts.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Yeah thats right, i'll fix it :)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I'm getting some typescript errors with const http = require. These are "TS2503: Cannot find namespace 'http'." and "error TS4055: Return type of public method from exported class has or is using private name 'http'.". As described here: https://stackoverflow.com/questions/31173738/typescript-getting-error-ts2304-cannot-find-name-require there are some ways to make this work, but to be honest i don't see a reason why to make a difference at this point. All other modules are imported with the "import .. from" stmt independent of the ES6 flag. So i removed the switch and changed the tsconfig to make the imports http/request work. What do you think about this solution?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

For TypeScript to use these you need the types for the Nodejs internal ones. Basically @types/node.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The current solution should be fine.

@DanielRuf

Copy link
Copy Markdown
Contributor
  • [ x]

You might want to remove the space inside the square brackets (it is either a space or x as single character) ;-)

@macjohnny

Copy link
Copy Markdown
Member

@laubfall could you please fix the CI issues?

@DanielRufDanielRuf left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

See my remarks / comments =)

@wing328

Copy link
Copy Markdown
Member

Thanks for the PR but your commit (as shown in the Commits tab) is not linked to your Github account, which means this PR won't count as your contribution in https://github.com/OpenAPITools/openapi-generator/graphs/contributors.

Let me know if you need help fixing it.

Ref: https://github.com/OpenAPITools/openapi-generator/wiki/FAQ#how-can-i-update-commits-that-are-not-linked-to-my-github-account

@wing328

Copy link
Copy Markdown
Member

I just pushed 547e305 to fix the CI failure. Let's see how that goes.

model/pet.ts
model/tag.ts
model/user.ts
model/./apiResponse.ts

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why this change? ./ makes not much sense in my opinion.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Agreed ./ is not needed. We'll tackle it separately.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Ok, so there is nothing left here to todo for the PR?

@laubfall

laubfall commented Jul 31, 2020

Copy link
Copy Markdown
ContributorAuthor

I just pushed 547e305 to fix the CI failure. Let's see how that goes.

Thanks, i looked into the CI Failure but did not saw the reason why the build failed

@wing328

Copy link
Copy Markdown
Member

Shippable CI failure not related to this PR.

@wing328
wing328 merged commit b838e18 into OpenAPITools:masterJul 31, 2020
jimschubert added a commit that referenced this pull request Aug 3, 2020
* master: (121 commits)
[PowerShell] better publishing workflow (#7114)
[aspnetcore] Typo issues in docs and generated code (#7094)
fix http signaure auth in build.sbt (#7110)
fix for the issue facing spec invlolving arrayschema structure with ref (#6310)
[csharp-netcore] added cancellation tokens to async calls (#7077)
[PS] Allow CI to publish the module (#7091)
[Dart] Treat float as double (#6924)
[Java][jersey2]Fix gradle HttpSignatureAuth dependencies (#7096)
move maven,gradle tests to shipppable ci (#7108)
[MARKDOWN] Fix issue 6089 with property and parameter names (#6105)
[BUG] Multi-Part content type in response ignores properties of composed schema (allOf/oneOf) (#6073)
[online] Fix for version conflicts with springfox/boot (#7102)
skip some installations to shorten build time
[Go][Exp] better code format (#7088)
Fix Shippable CI (#7097)
typescript-node: clean up require and import (#6947)
commented out perl, bash tests to reduce build time
Add a link to conference paper (#7086)
Add a link to the blog post at qiita (#7084)
migrate typescript.sh to new config format (#7078)
...
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG] typescript-node mixes require and import

4 participants

@laubfall@DanielRuf@macjohnny@wing328
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

typescript-node: clean up require and import - #6947

Merged
wing328 merged 8 commits into
OpenAPITools:masterfrom
laubfall:typescript-node_mixes_require_and_import_4656
Jul 31, 2020
Merged

typescript-node: clean up require and import#6947
wing328 merged 8 commits into
OpenAPITools:masterfrom
laubfall:typescript-node_mixes_require_and_import_4656

Conversation

@laubfall

@laubfalllaubfall commented Jul 15, 2020

Copy link
Copy Markdown
Contributor

… instead of import statement

PR checklist

  • Read the contribution guidelines.
  • If contributing template-only or documentation-only changes which will change sample output, build the project beforehand.
  • Run the shell script ./bin/generate-samples.shto update all Petstore samples related to your fix. This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master. These must match the expectations made by your contribution. You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/config/java*. For Windows users, please run the script in Git BASH.
  • File the PR against the correct branch: master
  • Copy the technical committee to review the pull request if your PR is targeting a particular programming language.

@TiFu (2017/07) @taxpon (2017/07) @sebastianhaas (2017/07) @kenisteward (2017/07) @Vrolijkx (2017/09) @macjohnny (2018/01) @topce (2018/10) @akehir (2019/07) @petejohansonxo (2019/11) @amakhrov (2020/02)

@macjohnnymacjohnny changed the title Typescript node mixes require and import 4656typescript-node: clean up require and importJul 15, 2020

@macjohnnymacjohnny left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@macjohnnymacjohnny added this to the 5.0.0 milestone Jul 15, 2020
import http from 'http';
{{/supportsES6}}
{{^supportsES6}}
import localVarRequest = require('request');

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The import var = require does not make much sense to me. This should be probably const localVarRequest = require('request').

Or did I oversee something?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Same for the other parts.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Yeah thats right, i'll fix it :)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I'm getting some typescript errors with const http = require. These are "TS2503: Cannot find namespace 'http'." and "error TS4055: Return type of public method from exported class has or is using private name 'http'.". As described here: https://stackoverflow.com/questions/31173738/typescript-getting-error-ts2304-cannot-find-name-require there are some ways to make this work, but to be honest i don't see a reason why to make a difference at this point. All other modules are imported with the "import .. from" stmt independent of the ES6 flag. So i removed the switch and changed the tsconfig to make the imports http/request work. What do you think about this solution?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

For TypeScript to use these you need the types for the Nodejs internal ones. Basically @types/node.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The current solution should be fine.

@DanielRuf

Copy link
Copy Markdown
Contributor
  • [ x]

You might want to remove the space inside the square brackets (it is either a space or x as single character) ;-)

@macjohnny

Copy link
Copy Markdown
Member

@laubfall could you please fix the CI issues?

@DanielRufDanielRuf left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

See my remarks / comments =)

@wing328

Copy link
Copy Markdown
Member

Thanks for the PR but your commit (as shown in the Commits tab) is not linked to your Github account, which means this PR won't count as your contribution in https://github.com/OpenAPITools/openapi-generator/graphs/contributors.

Let me know if you need help fixing it.

Ref: https://github.com/OpenAPITools/openapi-generator/wiki/FAQ#how-can-i-update-commits-that-are-not-linked-to-my-github-account

@wing328

Copy link
Copy Markdown
Member

I just pushed 547e305 to fix the CI failure. Let's see how that goes.

model/pet.ts
model/tag.ts
model/user.ts
model/./apiResponse.ts

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why this change? ./ makes not much sense in my opinion.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Agreed ./ is not needed. We'll tackle it separately.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Ok, so there is nothing left here to todo for the PR?

@laubfall

laubfall commented Jul 31, 2020

Copy link
Copy Markdown
ContributorAuthor

I just pushed 547e305 to fix the CI failure. Let's see how that goes.

Thanks, i looked into the CI Failure but did not saw the reason why the build failed

@wing328

Copy link
Copy Markdown
Member

Shippable CI failure not related to this PR.

@wing328
wing328 merged commit b838e18 into OpenAPITools:masterJul 31, 2020
jimschubert added a commit that referenced this pull request Aug 3, 2020
* master: (121 commits)
[PowerShell] better publishing workflow (#7114)
[aspnetcore] Typo issues in docs and generated code (#7094)
fix http signaure auth in build.sbt (#7110)
fix for the issue facing spec invlolving arrayschema structure with ref (#6310)
[csharp-netcore] added cancellation tokens to async calls (#7077)
[PS] Allow CI to publish the module (#7091)
[Dart] Treat float as double (#6924)
[Java][jersey2]Fix gradle HttpSignatureAuth dependencies (#7096)
move maven,gradle tests to shipppable ci (#7108)
[MARKDOWN] Fix issue 6089 with property and parameter names (#6105)
[BUG] Multi-Part content type in response ignores properties of composed schema (allOf/oneOf) (#6073)
[online] Fix for version conflicts with springfox/boot (#7102)
skip some installations to shorten build time
[Go][Exp] better code format (#7088)
Fix Shippable CI (#7097)
typescript-node: clean up require and import (#6947)
commented out perl, bash tests to reduce build time
Add a link to conference paper (#7086)
Add a link to the blog post at qiita (#7084)
migrate typescript.sh to new config format (#7078)
...
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG] typescript-node mixes require and import

4 participants

@laubfall@DanielRuf@macjohnny@wing328
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

typescript-node: clean up require and import - #6947

Merged
wing328 merged 8 commits into
OpenAPITools:masterfrom
laubfall:typescript-node_mixes_require_and_import_4656
Jul 31, 2020
Merged

typescript-node: clean up require and import#6947
wing328 merged 8 commits into
OpenAPITools:masterfrom
laubfall:typescript-node_mixes_require_and_import_4656

Conversation

@laubfall

@laubfalllaubfall commented Jul 15, 2020

Copy link
Copy Markdown
Contributor

… instead of import statement

PR checklist

  • Read the contribution guidelines.
  • If contributing template-only or documentation-only changes which will change sample output, build the project beforehand.
  • Run the shell script ./bin/generate-samples.shto update all Petstore samples related to your fix. This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master. These must match the expectations made by your contribution. You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/config/java*. For Windows users, please run the script in Git BASH.
  • File the PR against the correct branch: master
  • Copy the technical committee to review the pull request if your PR is targeting a particular programming language.

@TiFu (2017/07) @taxpon (2017/07) @sebastianhaas (2017/07) @kenisteward (2017/07) @Vrolijkx (2017/09) @macjohnny (2018/01) @topce (2018/10) @akehir (2019/07) @petejohansonxo (2019/11) @amakhrov (2020/02)

@macjohnnymacjohnny changed the title Typescript node mixes require and import 4656typescript-node: clean up require and importJul 15, 2020

@macjohnnymacjohnny left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@macjohnnymacjohnny added this to the 5.0.0 milestone Jul 15, 2020
import http from 'http';
{{/supportsES6}}
{{^supportsES6}}
import localVarRequest = require('request');

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The import var = require does not make much sense to me. This should be probably const localVarRequest = require('request').

Or did I oversee something?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Same for the other parts.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Yeah thats right, i'll fix it :)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I'm getting some typescript errors with const http = require. These are "TS2503: Cannot find namespace 'http'." and "error TS4055: Return type of public method from exported class has or is using private name 'http'.". As described here: https://stackoverflow.com/questions/31173738/typescript-getting-error-ts2304-cannot-find-name-require there are some ways to make this work, but to be honest i don't see a reason why to make a difference at this point. All other modules are imported with the "import .. from" stmt independent of the ES6 flag. So i removed the switch and changed the tsconfig to make the imports http/request work. What do you think about this solution?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

For TypeScript to use these you need the types for the Nodejs internal ones. Basically @types/node.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The current solution should be fine.

@DanielRuf

Copy link
Copy Markdown
Contributor
  • [ x]

You might want to remove the space inside the square brackets (it is either a space or x as single character) ;-)

@macjohnny

Copy link
Copy Markdown
Member

@laubfall could you please fix the CI issues?

@DanielRufDanielRuf left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

See my remarks / comments =)

@wing328

Copy link
Copy Markdown
Member

Thanks for the PR but your commit (as shown in the Commits tab) is not linked to your Github account, which means this PR won't count as your contribution in https://github.com/OpenAPITools/openapi-generator/graphs/contributors.

Let me know if you need help fixing it.

Ref: https://github.com/OpenAPITools/openapi-generator/wiki/FAQ#how-can-i-update-commits-that-are-not-linked-to-my-github-account

@wing328

Copy link
Copy Markdown
Member

I just pushed 547e305 to fix the CI failure. Let's see how that goes.

model/pet.ts
model/tag.ts
model/user.ts
model/./apiResponse.ts

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why this change? ./ makes not much sense in my opinion.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Agreed ./ is not needed. We'll tackle it separately.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Ok, so there is nothing left here to todo for the PR?

@laubfall

laubfall commented Jul 31, 2020

Copy link
Copy Markdown
ContributorAuthor

I just pushed 547e305 to fix the CI failure. Let's see how that goes.

Thanks, i looked into the CI Failure but did not saw the reason why the build failed

@wing328

Copy link
Copy Markdown
Member

Shippable CI failure not related to this PR.

@wing328
wing328 merged commit b838e18 into OpenAPITools:masterJul 31, 2020
jimschubert added a commit that referenced this pull request Aug 3, 2020
* master: (121 commits)
[PowerShell] better publishing workflow (#7114)
[aspnetcore] Typo issues in docs and generated code (#7094)
fix http signaure auth in build.sbt (#7110)
fix for the issue facing spec invlolving arrayschema structure with ref (#6310)
[csharp-netcore] added cancellation tokens to async calls (#7077)
[PS] Allow CI to publish the module (#7091)
[Dart] Treat float as double (#6924)
[Java][jersey2]Fix gradle HttpSignatureAuth dependencies (#7096)
move maven,gradle tests to shipppable ci (#7108)
[MARKDOWN] Fix issue 6089 with property and parameter names (#6105)
[BUG] Multi-Part content type in response ignores properties of composed schema (allOf/oneOf) (#6073)
[online] Fix for version conflicts with springfox/boot (#7102)
skip some installations to shorten build time
[Go][Exp] better code format (#7088)
Fix Shippable CI (#7097)
typescript-node: clean up require and import (#6947)
commented out perl, bash tests to reduce build time
Add a link to conference paper (#7086)
Add a link to the blog post at qiita (#7084)
migrate typescript.sh to new config format (#7078)
...
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG] typescript-node mixes require and import

4 participants

@laubfall@DanielRuf@macjohnny@wing328
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

typescript-node: clean up require and import - #6947

Merged
wing328 merged 8 commits into
OpenAPITools:masterfrom
laubfall:typescript-node_mixes_require_and_import_4656
Jul 31, 2020
Merged

typescript-node: clean up require and import#6947
wing328 merged 8 commits into
OpenAPITools:masterfrom
laubfall:typescript-node_mixes_require_and_import_4656

Conversation

@laubfall

@laubfalllaubfall commented Jul 15, 2020

Copy link
Copy Markdown
Contributor

… instead of import statement

PR checklist

  • Read the contribution guidelines.
  • If contributing template-only or documentation-only changes which will change sample output, build the project beforehand.
  • Run the shell script ./bin/generate-samples.shto update all Petstore samples related to your fix. This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master. These must match the expectations made by your contribution. You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/config/java*. For Windows users, please run the script in Git BASH.
  • File the PR against the correct branch: master
  • Copy the technical committee to review the pull request if your PR is targeting a particular programming language.

@TiFu (2017/07) @taxpon (2017/07) @sebastianhaas (2017/07) @kenisteward (2017/07) @Vrolijkx (2017/09) @macjohnny (2018/01) @topce (2018/10) @akehir (2019/07) @petejohansonxo (2019/11) @amakhrov (2020/02)

@macjohnnymacjohnny changed the title Typescript node mixes require and import 4656typescript-node: clean up require and importJul 15, 2020

@macjohnnymacjohnny left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM

@macjohnnymacjohnny added this to the 5.0.0 milestone Jul 15, 2020
import http from 'http';
{{/supportsES6}}
{{^supportsES6}}
import localVarRequest = require('request');

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The import var = require does not make much sense to me. This should be probably const localVarRequest = require('request').

Or did I oversee something?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Same for the other parts.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Yeah thats right, i'll fix it :)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I'm getting some typescript errors with const http = require. These are "TS2503: Cannot find namespace 'http'." and "error TS4055: Return type of public method from exported class has or is using private name 'http'.". As described here: https://stackoverflow.com/questions/31173738/typescript-getting-error-ts2304-cannot-find-name-require there are some ways to make this work, but to be honest i don't see a reason why to make a difference at this point. All other modules are imported with the "import .. from" stmt independent of the ES6 flag. So i removed the switch and changed the tsconfig to make the imports http/request work. What do you think about this solution?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

For TypeScript to use these you need the types for the Nodejs internal ones. Basically @types/node.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The current solution should be fine.

@DanielRuf

Copy link
Copy Markdown
Contributor
  • [ x]

You might want to remove the space inside the square brackets (it is either a space or x as single character) ;-)

@macjohnny

Copy link
Copy Markdown
Member

@laubfall could you please fix the CI issues?

@DanielRufDanielRuf left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

See my remarks / comments =)

@wing328

Copy link
Copy Markdown
Member

Thanks for the PR but your commit (as shown in the Commits tab) is not linked to your Github account, which means this PR won't count as your contribution in https://github.com/OpenAPITools/openapi-generator/graphs/contributors.

Let me know if you need help fixing it.

Ref: https://github.com/OpenAPITools/openapi-generator/wiki/FAQ#how-can-i-update-commits-that-are-not-linked-to-my-github-account

@wing328

Copy link
Copy Markdown
Member

I just pushed 547e305 to fix the CI failure. Let's see how that goes.

model/pet.ts
model/tag.ts
model/user.ts
model/./apiResponse.ts

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why this change? ./ makes not much sense in my opinion.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Agreed ./ is not needed. We'll tackle it separately.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Ok, so there is nothing left here to todo for the PR?

@laubfall

laubfall commented Jul 31, 2020

Copy link
Copy Markdown
ContributorAuthor

I just pushed 547e305 to fix the CI failure. Let's see how that goes.

Thanks, i looked into the CI Failure but did not saw the reason why the build failed

@wing328

Copy link
Copy Markdown
Member

Shippable CI failure not related to this PR.

@wing328
wing328 merged commit b838e18 into OpenAPITools:masterJul 31, 2020
jimschubert added a commit that referenced this pull request Aug 3, 2020
* master: (121 commits)
[PowerShell] better publishing workflow (#7114)
[aspnetcore] Typo issues in docs and generated code (#7094)
fix http signaure auth in build.sbt (#7110)
fix for the issue facing spec invlolving arrayschema structure with ref (#6310)
[csharp-netcore] added cancellation tokens to async calls (#7077)
[PS] Allow CI to publish the module (#7091)
[Dart] Treat float as double (#6924)
[Java][jersey2]Fix gradle HttpSignatureAuth dependencies (#7096)
move maven,gradle tests to shipppable ci (#7108)
[MARKDOWN] Fix issue 6089 with property and parameter names (#6105)
[BUG] Multi-Part content type in response ignores properties of composed schema (allOf/oneOf) (#6073)
[online] Fix for version conflicts with springfox/boot (#7102)
skip some installations to shorten build time
[Go][Exp] better code format (#7088)
Fix Shippable CI (#7097)
typescript-node: clean up require and import (#6947)
commented out perl, bash tests to reduce build time
Add a link to conference paper (#7086)
Add a link to the blog post at qiita (#7084)
migrate typescript.sh to new config format (#7078)
...
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG] typescript-node mixes require and import

4 participants

@laubfall@DanielRuf@macjohnny@wing328