application rebuild publish

Author: sinclairzx81

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "typescript-bundle",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": " A zero configuration bundling tool for TypeScript.",
   "scripts": {
     "clean": "node tasks clean",

package.json

@@ -68,7 +68,7 @@ interface AMDResult {
 }
 class AMDReader {
   public static read(code: string): AMDResult {
-    const document: AMDResult = { defines: [], remaps: {} }
+    const result: AMDResult = { defines: [], remaps: {} }
     const resource_names: {[name: string]: null} = {}
     const pattern = /define\s*\("(.*)",\s*\[(.*)],\s*function/gm
     while(true) {
@@ -90,27 +90,44 @@ class AMDReader {
             const directive = split[0]
             const absoluteName = join(module_root, split[1])
             const resource = `${directive}!${absoluteName}`
-            document.remaps[resource] = document.remaps[resource] || []
-            document.remaps[resource].push(dependency)
+            result.remaps[resource] = result.remaps[resource] || []
+            result.remaps[resource].push(dependency)
             resource_names[resource] = null
             return resource
           }
         }
         return dependency
       })
       const define = { type, name, dependencies: dependencies }
-      document.defines.push(define as Define)
+      result.defines.push(define as Define)
+    }
+    
+    // Resolve the resource path prefix. This is resolved from the
+    // 'last' definition in the bundle. We are looking for multi
+    // component paths (i.e 'parent/index'). This indicates that
+    // TypeScript has re-orientated the module paths due to a
+    // module inside the 'projectRoot' importing outside the project
+    // root. In these cases, we prefix the resourcePath with ../.
+    // for as many path components found - 1.
+    let resourcePathPrefix = './'
+    if(result.defines.length > 0) {
+      const entry = result.defines[result.defines.length - 1] as Module
+      const split = entry.name.split('/')
+      if(split.length > 1) {
+        resourcePathPrefix = split.slice(1).map(n => '../').join('')
+      }
     }
 
     // Construct Resources from 'resource_names' accumulator.
     const resources = Object.keys(resource_names).map(name => {
-      const [directive, path] = name.split('!')
+      const [directive, moduleName] = name.split('!')
       const dependencies = ["exports"]
       const type = 'resource'
+      const path = `${resourcePathPrefix}${moduleName}`
       return { type, name, path, directive, dependencies } as Resource
     })
-    document.defines.unshift(...resources)
-    return document
+    result.defines.unshift(...resources)
+    return result
   }
 }
 

src/bundler/resources/resources.ts

@@ -29,16 +29,16 @@ THE SOFTWARE.
 import { readFileSync } from 'fs'
 import { render }       from './render'
 
-function get(fileName: string): string {
+function get(filePath: string): string {
   try {
-    const buffer = readFileSync(fileName)
+    const buffer = readFileSync(filePath)
     return `"${buffer.toString('base64')}"`
   } catch {
     const buffer = Buffer.from([])
     return `"${buffer.toString('base64')}"`
   }
 }
 
-export function asBase64(moduleName: string, fileName: string) {
-  return render(moduleName, get(fileName))
+export function asBase64(moduleName: string, filePath: string) {
+  return render(moduleName, get(filePath))
 }

src/bundler/resources/templates/base64.ts

@@ -29,16 +29,16 @@ THE SOFTWARE.
 import { readFileSync } from 'fs'
 import { render }       from './render'
 
-function get(fileName: string): string {
+function get(filePath: string): string {
   try {
-    const content = readFileSync(fileName) as Uint8Array
+    const content = readFileSync(filePath) as Uint8Array
     const buffer = [...content]
     return `new Uint8Array([${buffer.join(',')}])`
   } catch {
     return `new Uint8Array([])`
   }
 }
 
-export function asBuffer(moduleName: string, fileName: string) {
-  return render(moduleName, get(fileName))
+export function asBuffer(moduleName: string, filePath: string) {
+  return render(moduleName, get(filePath))
 }

src/bundler/resources/templates/buffer.ts

@@ -34,10 +34,10 @@ function formatJson(data: any): string {
   return JSON.stringify(data, null, 2).split('\n').map((n, i) => (i > 0) ? `  ${n}`: n).join("\n")
 }
 
-function get(fileName: string): string {
+function get(filePath: string): string {
   let content = ''
   try {
-    content = readFileSync(fileName, 'utf8')
+    content = readFileSync(filePath, 'utf8')
   } catch(error) {
     return formatJson({ error: 'unable to load resource'})
   }
@@ -49,6 +49,6 @@ function get(fileName: string): string {
   }
 }
 
-export function asJson(moduleName: string, fileName: string) {
-  return render(moduleName, get(fileName))
+export function asJson(moduleName: string, filePath: string) {
+  return render(moduleName, get(filePath))
 }

src/bundler/resources/templates/json.ts

@@ -29,9 +29,9 @@ THE SOFTWARE.
 import { render }       from './render'
 import { readFileSync } from 'fs'
 
-function get(fileName: string): string {
+function get(filePath: string): string {
   try {
-    const content = readFileSync(fileName, 'utf8')
+    const content = readFileSync(filePath, 'utf8')
     const lines = content.split('\n').map(line => {
       const text = line
         .replace(/\\/g, '\\\\"')
@@ -44,6 +44,6 @@ function get(fileName: string): string {
   }
 }
 
-export function asText(moduleName: string, fileName: string) {
-  return render(moduleName, get(fileName))
+export function asText(moduleName: string, filePath: string) {
+  return render(moduleName, get(filePath))
 }

src/bundler/resources/templates/text.ts

@@ -35,7 +35,7 @@ import { writeFileSync }                 from 'fs'
 /** Writes usage information */
 async function info() {
 
-  console.log(`Version 1.0.1
+  console.log(`Version 1.0.2
 
 Examples: tsc-bundle index.ts
           tsc-bundle tsconfig.json