Comparing version 0.0.31 to 0.0.32
@@ -7,2 +7,2 @@ import * as _hooks from './client/system-hooks'; | ||
export * from "./project-mapper"; | ||
export declare function hookSystemJs(systemJs: Object, baseURL: string, projectMap: Object, log?: (...args: string[]) => void, breakpointAt?: string): void; | ||
export declare function hookSystemJs(systemJs: Object, baseURL: string, projectMap: Object, log?: (...args: string[]) => void, breakpointAt?: string, noJSExtension?: RegExp): void; |
@@ -10,4 +10,4 @@ "use strict"; | ||
__export(require("./project-mapper")); | ||
function hookSystemJs(systemJs, baseURL, projectMap, log, breakpointAt) { | ||
systemJs['normalize'] = exports.hooks.normalize(systemJs['normalize'].bind(systemJs), baseURL, exports.locator, projectMap, log, breakpointAt); | ||
function hookSystemJs(systemJs, baseURL, projectMap, log, breakpointAt, noJSExtension) { | ||
systemJs['normalize'] = exports.hooks.normalize(systemJs['normalize'].bind(systemJs), baseURL, exports.locator, projectMap, log, breakpointAt, noJSExtension); | ||
systemJs['translate'] = exports.hooks.translate(systemJs['translate'].bind(systemJs)); | ||
@@ -14,0 +14,0 @@ } |
import { ProjectMap } from "./../project-mapper"; | ||
export declare function extractPackageNames(baseUrl: string, libMount: string, filePath: string): string[]; | ||
export declare function joinUrl(baseUrl: string, ...paths: string[]): string; | ||
export declare function preProcess(projectMap: ProjectMap, name: string, parentName?: string, parentAddress?: string): string; | ||
export declare function postProcess(projectMap: ProjectMap, baseUrl: string, resolvedName: string): string; | ||
export declare function preProcess(projectMap: ProjectMap, name: string, parentName?: string, parentAddress?: string, noJSExtension?: RegExp): string; | ||
export declare function postProcess(projectMap: ProjectMap, baseUrl: string, resolvedName: string, noJSExtension?: RegExp): string; |
@@ -7,3 +7,6 @@ "use strict"; | ||
} | ||
function normalizeTail(name) { | ||
function normalizeTail(name, ignorePattern) { | ||
if (ignorePattern && name.match(ignorePattern)) { | ||
return name; | ||
} | ||
var ext = getExt(name); | ||
@@ -17,3 +20,3 @@ if (ext === '.js' || ext === '.json' || ext === '.') { | ||
} | ||
function resolveAsPackage(projectMap, filePath) { | ||
function resolveAsPackage(projectMap, filePath, noJSExtension) { | ||
var segments = filePath.split('/').filter(function (ch) { return !!ch; }); | ||
@@ -27,3 +30,3 @@ var pkgName = segments[0]; | ||
: segments.slice(1).join('/'); | ||
return moduleSource + '/' + normalizeTail(tail); | ||
return moduleSource + '/' + normalizeTail(tail, noJSExtension); | ||
} | ||
@@ -35,3 +38,3 @@ else { | ||
else { | ||
return normalizeTail(filePath); | ||
return normalizeTail(filePath, noJSExtension); | ||
} | ||
@@ -92,3 +95,4 @@ } | ||
exports.joinUrl = joinUrl; | ||
function preProcess(projectMap, name, parentName, parentAddress) { | ||
function preProcess(projectMap, name, parentName, parentAddress, noJSExtension) { | ||
var packageRec = projectMap.packages[name]; | ||
var segments = name.split('/'); | ||
@@ -102,7 +106,7 @@ var packageName = segments[0]; | ||
var tail = segments.slice(1).join('/'); | ||
return segments[0] + '/' + normalizeTail(tail); | ||
return segments[0] + '/' + normalizeTail(tail, noJSExtension); | ||
} | ||
} | ||
else { | ||
var pkgMainFilePath = resolveAsPackage(projectMap, name); | ||
var pkgMainFilePath = resolveAsPackage(projectMap, name, noJSExtension); | ||
if (pkgMainFilePath) { | ||
@@ -112,3 +116,3 @@ return pkgMainFilePath; | ||
else { | ||
return normalizeTail(name); | ||
return normalizeTail(name, noJSExtension); | ||
} | ||
@@ -118,3 +122,4 @@ } | ||
exports.preProcess = preProcess; | ||
function postProcess(projectMap, baseUrl, resolvedName) { | ||
function postProcess(projectMap, baseUrl, resolvedName, noJSExtension) { | ||
var packageRec = projectMap.packages[resolvedName]; | ||
var filePath = resolvedName.slice(baseUrl.length); | ||
@@ -128,3 +133,3 @@ if (isDefaultIndexDir(projectMap, '/' + filePath)) { | ||
if (pkgs.length > 0) { | ||
var pkgMainFilePath = resolveAsPackage(projectMap, pkgs[pkgs.length - 1]); | ||
var pkgMainFilePath = resolveAsPackage(projectMap, pkgs[pkgs.length - 1], noJSExtension); | ||
if (pkgMainFilePath) { | ||
@@ -135,3 +140,3 @@ return joinUrl(baseUrl, pkgMainFilePath); | ||
} | ||
return normalizeTail(resolvedName); | ||
return normalizeTail(resolvedName, noJSExtension); | ||
} | ||
@@ -138,0 +143,0 @@ } |
@@ -1,2 +0,2 @@ | ||
export declare function normalize(origNormalize: any, baseURL: string, locator: any, projectMap: Object, log?: (...args: string[]) => void, breakpointAt?: string): (name: string, parentName: string, parentAddress: string) => any; | ||
export declare function normalize(origNormalize: any, baseURL: string, locator: any, projectMap: Object, log?: (...args: string[]) => void, breakpointAt?: string, noJSExtension?: RegExp): (name: string, parentName: string, parentAddress: string) => any; | ||
export declare function translate(origTranslate: any): (load: any) => any; |
"use strict"; | ||
function normalize(origNormalize, baseURL, locator, projectMap, log, breakpointAt) { | ||
function normalize(origNormalize, baseURL, locator, projectMap, log, breakpointAt, noJSExtension) { | ||
if (log === void 0) { log = function () { | ||
@@ -10,7 +10,7 @@ var args = []; | ||
return function bundlessNormalize(name, parentName, parentAddress) { | ||
var newName = locator.preProcess(projectMap, name, parentName, parentAddress); | ||
var newName = locator.preProcess(projectMap, name, parentName, parentAddress, noJSExtension); | ||
log("preProcess() " + name + " -> " + newName); | ||
return origNormalize(newName, parentName, parentAddress) | ||
.then(function (resolvedName) { | ||
var result = locator.postProcess(projectMap, baseURL, resolvedName); | ||
var result = locator.postProcess(projectMap, baseURL, resolvedName, noJSExtension); | ||
log("postProcess() " + name + ": " + resolvedName + " -> " + result); | ||
@@ -17,0 +17,0 @@ if (result === breakpointAt) { |
{ | ||
"name": "bundless", | ||
"version": "0.0.31", | ||
"version": "0.0.32", | ||
"description": "Experimental bundle-free dependency server", | ||
@@ -5,0 +5,0 @@ "main": "./dist/src/index.js", |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
791943
23587