- use bundler class api for bundled file path if bundler is not provided in pugbuild

 - bump version

Author: zbryikt

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## v0.0.62
+
+ - use bundler class api for bundled file path if bundler is not provided in pugbuild
+
+
 ## v0.0.61
 
  - auto set type when loading config if type is not defined 

dist/ext/bundle.js

@@ -1,7 +1,7 @@
 {
   "author": "zbryikt",
   "name": "@plotdb/srcbuild",
-  "version": "0.0.61",
+  "version": "0.0.62",
   "description": "",
   "main": "./dist/main.js",
   "files": [

dist/ext/pug.js

@@ -250,14 +250,7 @@ build.prototype = Object.create(base.prototype) <<< do
     if files.filter(~> it.file == @cfgfn).length => return @load-cfg!
     @specmgr.touch-code files
 
-  des-path: ({name, type}) ->
-    _desdir = path.join(@desdir, \assets, \bundle)
-    ext = if type == \block => \html else type
-    des = path.join(_desdir, "#name.#ext")
-    des-min = path.join(_desdir, "#name.min.#ext")
-    # we may have subfolders in name
-    desdir = path.dirname(des)
-    return {desdir, des, des-min}
+  des-path: ({name, type}) -> return build.des-path {desdir: @desdir, name, type}
 
   build-by-spec: (spec) ->
     <~ Promise.resolve!then _
@@ -319,4 +312,13 @@ build.prototype = Object.create(base.prototype) <<< do
         @log.error "#des failed: ".red
         @log.error {err: e}, e.message.toString!
 
+build.des-path = ({desdir, name, type}) ->
+  _desdir = path.join(desdir, \assets, \bundle)
+  ext = if type == \block => \html else type
+  des = path.join(_desdir, "#name.#ext")
+  des-min = path.join(_desdir, "#name.min.#ext")
+  # we may have subfolders in name
+  desdir = path.dirname(des)
+  return {desdir, des, des-min}
+
 module.exports = build

package-lock.json

@@ -1,5 +1,5 @@
 require! <[fs path fs-extra pug livescript uglify-js uglifycss stylus js-yaml marked crypto @plotdb/colors]>
-require! <[./base ../aux]>
+require! <[./base ../aux ./bundle]>
 
 cwd = process.cwd!
 
@@ -69,15 +69,17 @@ pugbuild.prototype = Object.create(base.prototype) <<< do
             if @bundler =>
               @bundler.add-spec spec
               des = @bundler.des-path spec
-              rel-des-min = path.relative(@desdir, des.des-min)
-              rel-des = path.relative(@desdir, des.des)
-              if o.type == \css
-                ret += """<link rel="stylesheet" type="text/css" href="/#{rel-des-min}"/>"""
-              else if o.type == \js
-                ret += """<script type="text/javascript" src="/#{rel-des-min}"></script>"""
-              else if o.type == \block
-                ret += """<link rel="block" href="/#{rel-des-min}">"""
-            else ret += "<!-- no bundler available for bundling #name in type #{o.type} -->"
+            else
+              # TODO the actual bundler may have different desdir. use this anyway for now.
+              des = bundle.des-path {desdir: @desdir} <<< spec
+            rel-des-min = path.relative(@desdir, des.des-min)
+            rel-des = path.relative(@desdir, des.des)
+            if o.type == \css
+              ret += """<link rel="stylesheet" type="text/css" href="/#{rel-des-min}"/>"""
+            else if o.type == \js
+              ret += """<script type="text/javascript" src="/#{rel-des-min}"></script>"""
+            else if o.type == \block
+              ret += """<link rel="block" href="/#{rel-des-min}">"""
 
           return ret
         'lsc': (text, opt) ->