Add JSPM support (#140)

Author: unional

.gitignore

@@ -4,3 +4,4 @@
 npm-debug.log
 /dist/
 /typings/
+spec-out

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "typescript.tsdk": "./node_modules/typescript/lib"
+}

package.json

@@ -14,7 +14,9 @@
     "dependency-check": "dependency-check . --unused --no-dev && dependency-check . --missing --no-dev",
     "test-spec": "ts-node node_modules/blue-tape/bin/blue-tape.js \"src/**/*.spec.ts\" | tap-diff",
     "test-cov": "ts-node node_modules/istanbul/lib/cli.js cover -e .ts --print none -x \"*.d.ts\" -x \"*.spec.ts\" node_modules/blue-tape/bin/blue-tape.js -- \"src/**/*.spec.ts\" | tap-diff",
-    "test": "npm run lint && npm run build && npm run dependency-check && npm run test-cov",
+    "test": "npm run build && npm run dependency-check && npm run test-cov && npm run lint",
+    "test-spec+lint": "npm run test-spec && npm run lint",
+    "watch": "onchange -w -i \"src/**/*.ts\" -e \"**/__test__/**\" -- npm run test-spec+lint",
     "bootstrap": "npm install shelljs && node scripts/bootstrap.js",
     "prepublish": "node scripts/prepublish.js"
   },
@@ -51,6 +53,7 @@
     "has": "^1.0.1",
     "invariant": "^2.2.0",
     "is-absolute": "^0.2.3",
+    "jspm-config": "^0.3.0",
     "listify": "^1.0.0",
     "lockfile": "^1.0.1",
     "make-error-cause": "^1.2.1",
@@ -81,6 +84,7 @@
     "dependency-check": "^2.5.1",
     "istanbul": "1.0.0-alpha.2",
     "nock": "^9.0.0",
+    "onchange": "3.0.2",
     "shelljs": "^0.7.0",
     "tap-diff": "^0.1.1",
     "ts-node": "^1.1.0",

src/__test__/jspm-typings-registry/jspm.config.js

@@ -0,0 +1,19 @@
+SystemJS.config({
+  paths: {
+    "npm:": "jspm_packages/npm/"
+  },
+  browserConfig: {
+    "baseURL": "/"
+  }
+});
+
+SystemJS.config({
+  packageConfigPaths: [
+    "npm:@*/*.json",
+    "npm:*.json",
+  ],
+  map: {
+    "make-error": "npm:[email protected]"
+  },
+  packages: {}
+});

src/__test__/jspm-typings-registry/jspm_packages/.dependencies.json

@@ -0,0 +1,6 @@
+{
+  "npm:[email protected]": {
+    "deps": {},
+    "peerDeps": {}
+  }
+}

src/__test__/jspm-typings-registry/jspm_packages/npm/[email protected]

@@ -0,0 +1,9 @@
+{
+  "main": "index.js",
+  "format": "cjs",
+  "meta": {
+    "*.json": {
+      "format": "json"
+    }
+  }
+}

src/__test__/jspm-typings-registry/jspm_packages/npm/[email protected]/.jspm-hash

@@ -0,0 +1,2 @@
+b58eca92530bbdb765d2d5847133b4fec748ac1299914b932bd37a50b983c5e7c90ae93bjspm-npm@[email protected]
+1753189ca5505b67a01be056b367285b

src/__test__/jspm-typings-registry/jspm_packages/npm/[email protected]/index.d.ts

@@ -0,0 +1,35 @@
+/**
+ * Create a new error constructor instance.
+ */
+declare function makeError(name: string): makeError.Constructor<makeError.BaseError>;
+
+/**
+ * Set the constructor prototype to `BaseError`.
+ */
+declare function makeError<T extends Error>(super_: { new (...args: any[]): T }): makeError.Constructor<T & makeError.BaseError>;
+
+/**
+ * Create a specialized error instance.
+ */
+declare function makeError<T extends Error>(name: string | Function, super_: { new (...args: any[]): T }): makeError.Constructor<T>;
+
+declare module makeError {
+  /**
+   * Use with ES6 inheritance.
+   */
+  export class BaseError implements Error {
+    message: string;
+    name: string;
+    stack: string;
+
+    constructor(message: string);
+  }
+
+  export interface Constructor <T> {
+    new (message: string): T
+    super_: any
+    prototype: T
+  }
+}
+
+export = makeError;

src/__test__/jspm-typings-registry/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "my-module",
+  "version": "0.1.2",
+  "jspm": {
+    "dependencies": {
+      "make-error": "npm:make-error@^1.2.0"
+    }
+  }
+}

src/__test__/jspm-typings-registry/typings.json

@@ -0,0 +1,2 @@
+{
+}

src/__test__/jspm-typings-registry/typings/index.d.ts

@@ -0,0 +1 @@
+/// <reference path="modules/make-error/index.d.ts" />

src/__test__/jspm-typings-registry/typings/modules/make-error/index.d.ts

@@ -0,0 +1,39 @@
+// Generated by typings
+// Source: jspm_packages/npm/[email protected]/index.d.ts
+declare module 'make-error' {
+/**
+ * Create a new error constructor instance.
+ */
+function makeError(name: string): makeError.Constructor<makeError.BaseError>;
+
+/**
+ * Set the constructor prototype to `BaseError`.
+ */
+function makeError<T extends Error>(super_: { new (...args: any[]): T }): makeError.Constructor<T & makeError.BaseError>;
+
+/**
+ * Create a specialized error instance.
+ */
+function makeError<T extends Error>(name: string | Function, super_: { new (...args: any[]): T }): makeError.Constructor<T>;
+
+module makeError {
+  /**
+   * Use with ES6 inheritance.
+   */
+  export class BaseError implements Error {
+    message: string;
+    name: string;
+    stack: string;
+
+    constructor(message: string);
+  }
+
+  export interface Constructor <T> {
+    new (message: string): T
+    super_: any
+    prototype: T
+  }
+}
+
+export = makeError;
+}

src/__test__/jspm-typings-registry/typings/modules/make-error/typings.json

@@ -0,0 +1,7 @@
+{
+  "resolution": "main",
+  "tree": {
+    "src": "/Users/hwong/github/typings/core/src/__test__/jspm-typings-registry/jspm_packages/npm/[email protected]/package.json",
+    "raw": "jspm:make-error"
+  }
+}

src/install.spec.ts

@@ -129,6 +129,13 @@ test('install', t => {
           }
         })
       })
+      .then(
+      () => {
+        rc.urlRewrites = {}
+      },
+      () => {
+        rc.urlRewrites = {}
+      })
   })
 
   t.test('install empty', t => {
@@ -150,3 +157,18 @@ test('install', t => {
       })
   })
 })
+
+test('install jspm module without package.json', t => {
+  const emitter = new EventEmitter()
+  const FIXTURE_DIR = join(__dirname, '__test__/jspm-typings-registry')
+  return installDependencyRaw('jspm:make-error', {
+    cwd: FIXTURE_DIR,
+    emitter
+  })
+    .then(function () {
+      return readFile(join(FIXTURE_DIR, 'typings/index.d.ts'), 'utf8')
+    })
+    .then(index => {
+      t.equal(index, '/// <reference path="modules/make-error/index.d.ts" />\n')
+    })
+})

src/interfaces/dependencies.ts

@@ -6,7 +6,7 @@ import { Browser } from './config'
 export interface Dependency {
   type: string
   raw: string
-  location: string
+  location?: string
   meta: DependencyMeta
 }
 
@@ -41,6 +41,7 @@ export interface DependencyTree {
   parent?: DependencyTree
   files?: string[]
   postmessage?: string
+  type?: string
   src: string
   raw: string
   global: boolean

src/lib/__test__/fixtures/jspm-typings-github/README.md

@@ -0,0 +1,3 @@
+# jspm-typings-github
+
+- typings.json with `github:` dependencies

src/lib/__test__/fixtures/jspm-typings-github/jspm.config.js

@@ -0,0 +1,25 @@
+SystemJS.config({
+  paths: {
+    "npm:": "jspm_packages/npm/"
+  },
+  browserConfig: {
+    "baseURL": "/"
+  }
+});
+
+SystemJS.config({
+  packageConfigPaths: [
+    "npm:@*/*.json",
+    "npm:*.json"
+  ],
+  map: {
+    "unthenify": "npm:[email protected]"
+  },
+  packages: {
+    "npm:[email protected]": {
+      "map": {
+        "util-arity": "npm:[email protected]"
+      }
+    }
+  }
+});

src/lib/__test__/fixtures/jspm-typings-github/jspm_packages/.dependencies.json

@@ -0,0 +1,12 @@
+{
+  "npm:[email protected]": {
+    "deps": {
+      "util-arity": "npm:util-arity@^1.0.2"
+    },
+    "peerDeps": {}
+  },
+  "npm:[email protected]": {
+    "deps": {},
+    "peerDeps": {}
+  }
+}

src/lib/__test__/fixtures/jspm-typings-github/jspm_packages/npm/[email protected]

@@ -0,0 +1,12 @@
+{
+  "main": "dist/index.js",
+  "format": "cjs",
+  "meta": {
+    "*.json": {
+      "format": "json"
+    }
+  },
+  "map": {
+    "./dist": "./dist/index.js"
+  }
+}

src/lib/__test__/fixtures/jspm-typings-github/jspm_packages/npm/[email protected]/dist/index.d.ts

@@ -0,0 +1,12 @@
+import { Promise } from 'es6-promise';
+declare function unthenify<U>(fn: () => Promise<U>): (cb: unthenify.Callback<U>) => any;
+declare function unthenify<T1, U>(fn: (a: T1) => Promise<U>): (a: T1, cb: unthenify.Callback<U>) => any;
+declare function unthenify<T1, T2, U>(fn: (a: T1, b: T2) => Promise<U>): (a: T1, b: T2, cb: unthenify.Callback<U>) => any;
+declare function unthenify<T1, T2, T3, U>(fn: (a: T1, b: T2, c: T3) => Promise<U>): (a: T1, b: T2, c: T3, cb: unthenify.Callback<U>) => any;
+declare function unthenify<T1, T2, T3, T4, U>(fn: (a: T1, b: T2, c: T3, d: T4) => Promise<U>): (a: T1, b: T2, c: T3, d: T4, cb: unthenify.Callback<U>) => any;
+declare function unthenify<T1, T2, T3, T4, T5, U>(fn: (a: T1, b: T2, c: T3, d: T4, e: T5) => Promise<U>): (a: T1, b: T2, c: T3, d: T4, e: T5, cb: unthenify.Callback<U>) => any;
+declare function unthenify<T1, T2, T3, T4, T5, T6, U>(fn: (a: T1, b: T2, c: T3, d: T4, e: T5, f: T6) => Promise<U>): (a: T1, b: T2, c: T3, d: T4, e: T5, f: T6, cb: unthenify.Callback<U>) => any;
+declare namespace unthenify {
+    type Callback<T> = (error: Error, result: T) => any;
+}
+export = unthenify;

src/lib/__test__/fixtures/jspm-typings-github/jspm_packages/npm/[email protected]/package.json

@@ -0,0 +1,54 @@
+{
+  "name": "unthenify",
+  "version": "1.0.2",
+  "description": "Callbackify a promise function. The logical reverse of `thenify`.",
+  "main": "dist/index.js",
+  "files": [
+    "dist/",
+    "typings.json",
+    "LICENSE"
+  ],
+  "scripts": {
+    "lint": "tslint \"src/**/*.ts\"",
+    "build": "rm -rf dist/ && tsc",
+    "test-spec": "ts-node node_modules/blue-tape/bin/blue-tape.js \"src/**/*.spec.ts\" | tap-spec",
+    "test-cov": "ts-node node_modules/istanbul/lib/cli.js cover -e .ts --print none -x \"*.d.ts\" -x \"*.spec.ts\" blue-tape -- \"src/**/*.spec.ts\" | tap-spec",
+    "test": "npm run lint && npm run test-cov",
+    "prepublish": "typings install && npm run build"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/blakeembrey/unthenify.git"
+  },
+  "keywords": [
+    "thenify",
+    "promise",
+    "callback",
+    "nodeify",
+    "then"
+  ],
+  "author": {
+    "name": "Blake Embrey",
+    "email": "[email protected]",
+    "url": "http://blakeembrey.me"
+  },
+  "license": "Apache-2.0",
+  "bugs": {
+    "url": "https://github.com/blakeembrey/unthenify/issues"
+  },
+  "homepage": "https://github.com/blakeembrey/unthenify",
+  "devDependencies": {
+    "any-promise": "^1.1.0",
+    "blue-tape": "^0.2.0",
+    "bluebird": "^3.1.1",
+    "istanbul": "1.0.0-alpha.2",
+    "tap-spec": "^4.1.1",
+    "ts-node": "^0.9.2",
+    "tslint": "^3.1.1",
+    "typescript": "^1.7.3",
+    "typings": "^1.3.0"
+  },
+  "dependencies": {
+    "util-arity": "^1.0.2"
+  }
+}

src/lib/__test__/fixtures/jspm-typings-github/jspm_packages/npm/[email protected]/typings.json

@@ -0,0 +1,12 @@
+{
+  "globalDependencies": {
+    "node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts#8cf8164641be73e8f1e652c2a5b967c7210b6729"
+  },
+  "dependencies": {
+    "es6-promise": "github:typings/typed-es6-promise#94aac67ef7a14a8de8e9e1d3c1f9a26caa0d9fb1"
+  },
+  "devDependencies": {
+    "any-promise": "github:typings/typed-any-promise#74ba6cf22149ff4de39c2338a9cb84f9ded6f042",
+    "blue-tape": "github:typings/typed-blue-tape#a4e41a85d6f760e7c60088127968eae7d3a556fa"
+  }
+}

src/lib/__test__/fixtures/jspm-typings-github/jspm_packages/npm/[email protected]

@@ -0,0 +1,9 @@
+{
+  "main": "arity.js",
+  "format": "cjs",
+  "meta": {
+    "*.json": {
+      "format": "json"
+    }
+  }
+}

src/lib/__test__/fixtures/jspm-typings-github/jspm_packages/npm/[email protected]/arity.d.ts

@@ -0,0 +1,3 @@
+declare function arity (arity: number, fn: (...args: any[]) => any): (...args: any[]) => any;
+
+export = arity;