Skip to content

Commit

Permalink
fix for typescript import feature.
Browse files Browse the repository at this point in the history
  • Loading branch information
kazuhikoarase committed Oct 14, 2016
1 parent ff9c249 commit 120c0b5
Show file tree
Hide file tree
Showing 12 changed files with 114 additions and 4 deletions.
11 changes: 11 additions & 0 deletions .project
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,15 @@
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
<nature>com.palantir.typescript.typeScriptNature</nature>
</natures>
<filteredResources>
<filter>
<id>1476433004929</id>
<name></name>
<type>10</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-name-matches-true-false-node_modules</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
6 changes: 6 additions & 0 deletions .settings/.jsdtscope
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path=""/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path=""/>
</classpath>
22 changes: 19 additions & 3 deletions .settings/com.palantir.typescript.prefs
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
build.path.exportedFolder=
build.path.sourceFolder=ts/src/ts
compiler.outputDirOption=ts/build/ts
compiler.outputFileOption=QRCode.js
build.path.sourceFolder=
compiler.codeGenTarget=ECMASCRIPT5
compiler.compileOnSave=false
compiler.generateDeclarationFiles=false
compiler.inlineSourceMap=false
compiler.inlineSources=false
compiler.jsx=NONE
compiler.mapSourceFiles=false
compiler.moduleGenTarget=NONE
compiler.moduleResolution=CLASSIC
compiler.noFallthroughCasesInSwitch=false
compiler.noImplicitAny=false
compiler.noImplicitReturns=false
compiler.noLib=false
compiler.outputDirOption=
compiler.outputFileOption=
compiler.removeComments=false
compiler.suppressExcessPropertyErrors=false
compiler.suppressImplicitAnyIndexErrors=false
eclipse.preferences.version=1
4 changes: 4 additions & 0 deletions .settings/org.eclipse.core.resources.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
eclipse.preferences.version=1
encoding//php/sample_custom.php=MS932
encoding//php/sample_html.php=MS932
encoding//php/sample_image.php=MS932
1 change: 1 addition & 0 deletions .settings/org.eclipse.wst.jsdt.ui.superType.container
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.eclipse.wst.jsdt.launching.JRE_CONTAINER
1 change: 1 addition & 0 deletions .settings/org.eclipse.wst.jsdt.ui.superType.name
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Global
1 change: 1 addition & 0 deletions js/.npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ts-test
2 changes: 1 addition & 1 deletion js/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "qrcode-generator",
"version": "1.0.6",
"version": "1.0.7",
"description": "QR Code Generator implementation in JavaScript.",
"author": "Kazuhiko Arase",
"main": "qrcode.js",
Expand Down
4 changes: 4 additions & 0 deletions js/qrcode.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,7 @@ interface QRCode {
}

declare var qrcode : QRCodeFactory;

declare module 'qrcode-generator' {
export = qrcode;
}
36 changes: 36 additions & 0 deletions js/ts-test/Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
module.exports = function(grunt) {

grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
src: 'src',
build: 'build',
dist: 'dist',
ts: {
main: {
options : { sourceMap: false },
src: ['<%= src %>/**/*.ts'],
outDir: '<%= build %>'
}
},
nodeunit: {
all: [ '<%= build %>/*_test.js' ],
options: {
reporter: 'default',
reporterOptions: {
output: 'dist'
}
}
},
clean: {
build : { src: ['<%= build %>', '.tscache'] },
dist : { src: ['<%= dist %>'] }
}
});

grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-contrib-nodeunit');
grunt.loadNpmTasks("grunt-ts");

grunt.registerTask('default', ['ts']);

};
13 changes: 13 additions & 0 deletions js/ts-test/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"name": "ts-test",
"version": "0.1.0",
"devDependencies": {
"grunt": "^1.0.0",
"grunt-contrib-clean": "^1.0.0",
"grunt-contrib-nodeunit": "^1.0.0",
"grunt-ts": "^6.0.0-beta.3",
"typescript": "^2.0.0",
"uglify": "^0.1.5",
"qrcode-generator": "file:../"
}
}
17 changes: 17 additions & 0 deletions js/ts-test/src/import_test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
declare var require: any;
declare var exports : any;

import * as imported from "qrcode-generator";

exports.reqImp = function(test : any) {

var testQR = function(qrcode : any) {
test.equal(typeof qrcode, 'function');
test.equal(typeof qrcode.stringToBytes, 'function');
};

var required = require('qrcode-generator');
testQR(required);
testQR(imported);
test.done();
};

0 comments on commit 120c0b5

Please sign in to comment.