Merge pull request #9749 from samchon/master

TypeScript-STL & Samchon-Framework, right sentence of import & export

samchon-collection/samchon-collection-tests.ts

@@ -1,7 +1,4 @@
 /// <reference path="samchon-collection.d.ts" />
 
-declare var global: any;
-declare var require: (name: string) => any;
-
-collection = require("samchon-collection");
+import collection = require("samchon-collection");
 console.log(collection);

samchon-collection/samchon-collection.d.ts

@@ -3,21 +3,11 @@
 // Definitions by: Jeongho Nam <http://samchon.org>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-// ------------------------------------------------------------------------------------
-// In Samchon Collection, merging multiple 'ts' files to a module is not possible yet.
-// Instead of using "import" instruction, use such trick: 
-//
-// <code>
-// declare var global: any;
-// declare var require: Function;
-//
-// collection = require("samchon-collection");
-// let cont: collection.ArrayCollection<string> = new collection.ArrayCollection<string>();
-// </code>
-//
-// Those declaration of global and require can be substituted by using "node.d.ts"
-// ------------------------------------------------------------------------------------
-
 /// <reference path="../samchon-framework/samchon-framework.d.ts" />
 
-declare var collection: typeof samchon.collection;
+declare module "samchon-collection"
+{
+	import collection = samchon.collection;
+	export = collection;
+}
+

samchon-framework/samchon-framework-tests.ts

@@ -1,7 +1,4 @@
 /// <reference path="samchon-framework.d.ts" />
 
-declare var global: any;
-declare var require: any;
-
-global["samchon"] = require("samchon-framework");
+import samchon = require("samchon-framework");
 console.log(samchon);

samchon-library/samchon-library-tests.ts

@@ -1,7 +1,4 @@
 /// <reference path="samchon-library.d.ts" />
 
-declare var global: any;
-declare var require: (name: string) => any;
-
-library = require("samchon-library");
+import library = require("samchon-library");
 console.log(library);

samchon-library/samchon-library.d.ts

@@ -3,21 +3,11 @@
 // Definitions by: Jeongho Nam <http://samchon.org>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-// ------------------------------------------------------------------------------------
-// In Samchon Collection, merging multiple 'ts' files to a module is not possible yet.
-// Instead of using "import" instruction, use such trick: 
-//
-// <code>
-// declare var global: any;
-// declare var require: Function;
-//
-// library = require("samchon-library");
-// let xml: library.XML = new library.XML();
-// </code>
-//
-// Those declaration of global and require can be substituted by using "node.d.ts"
-// ------------------------------------------------------------------------------------
-
 /// <reference path="../samchon-framework/samchon-framework.d.ts" />
 
-declare var library: typeof samchon.library;
+declare module "samchon-library"
+{
+	import library = samchon.library;
+	export = library;
+}
+

typescript-stl/typescript-stl-tests.ts

@@ -1,7 +1,4 @@
 /// <reference path="typescript-stl.d.ts" />
 
-declare var global: any;
-declare var require: any;
-
-global["std"] = require("typescript-stl");
+import std = require("typescript-stl");
 std.example.test_all();