@aj-shadow/z-build-project 0.0.0-aj-beta.227 → 0.0.0-aj-beta.236

package/npm-shrinkwrap.json

@@ -1,13 +1,13 @@
 {
   "name": "@aj-shadow/z-build-project",
-  "version": "0.0.0-aj-beta.227",
+  "version": "0.0.0-aj-beta.236",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@aj-shadow/z-build-project",
-      "version": "0.0.0-aj-beta.227",
-      "license": "SEE LICENSE IN LICENSE.txt"
+      "version": "0.0.0-aj-beta.236",
+      "license": "MIT"
     }
   }
 }

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@aj-shadow/z-build-project",
-  "version": "0.0.0-aj-beta.227",
+  "version": "0.0.0-aj-beta.236",
   "release-step": "delivery",
   "description": "Library used by @actorjs/actorjs",
   "author": "ActorJs",
-  "license": "SEE LICENSE IN LICENSE.txt",
-  "dependencies": {},
-  "repository": "https://gitlab.com/actorjs-shadow-delivery-public/z-build-project.git"
+  "license": "MIT",
+  "repository": "https://gitlab.com/actorjs-shadow-delivery-public/z-build-project.git",
+  "dependencies": {}
 }

package/project/server/bottleneck-queue.js

@@ -1,5 +1,5 @@
 
-'use strict';
+// SPDX-License-Identifier: MIT; Copyright (c) 2026 Hagnell Konsulting AB
 
 
 class BottleneckQueue {

package/project/server/build-all.js

@@ -1,5 +1,5 @@
 
-'use strict';
+// SPDX-License-Identifier: MIT; Copyright (c) 2026 Hagnell Konsulting AB
 
 const Log = require('./log');
 const Workspace = require('./workspace');

package/project/server/build-client-bundle.js

@@ -1,5 +1,5 @@
 
-'use strict';
+// SPDX-License-Identifier: MIT; Copyright (c) 2026 Hagnell Konsulting AB
 
 const Build = require('./build');
 const Log = require('./log');
@@ -9,17 +9,18 @@ const Fs = require('fs');
 
 
 class BuildClientBundle extends Build {
-  constructor(appName, layer, part, source, dest, ignores, externals, externalGlobs, exports, exportSource, shim) {
-    super(appName, `Bundle:${layer}Layer/${part}`, __filename, source, dest);
+  constructor(appName, folderName, layer, part, source, dest, ignores, maps, exports, allowRequire, entryFiles, externalsGlobMap, externalsMap) {
+    super(appName, folderName, `Bundle:${layer}Layer/${part}`, __filename, source, dest);
     this.layer = layer;
     this.part = part;
     this.bundleName = `${layer}Layer-${part}.js`;
     this.ignores = ignores;
-    this.externals = externals;
-    this.externalGlobs = externalGlobs;
+    this.maps = maps;
     this.exports = exports;
-    this.exportSource = exportSource;
-    this.shim = shim;
+    this.allowRequire = allowRequire;
+    this.entryFiles = entryFiles;
+    this.externalsGlobMap = Array.from(externalsGlobMap);
+    this.externalsMap = Array.from(externalsMap);
     this.buildEnv = 'development' === Reflect.get(global, 'release-data@actorjs_global').env ? 0 : 1;
   }
   
@@ -30,11 +31,12 @@ class BuildClientBundle extends Build {
       source: this.source,
       dest: this.dest,
       ignores: this.ignores,
-      externals: this.externals,
-      externalGlobs: this.externalGlobs,
+      maps: this.maps,
       exports: this.exports,
-      exportSource: this.exportSource,
-      shim: this.shim
+      allowRequire: this.allowRequire,
+      entryFiles: this.entryFiles,
+      externalsGlobMap: this.externalsGlobMap,
+      externalsMap: this.externalsMap,
     };
   }
   
@@ -56,7 +58,7 @@ class BuildClientBundle extends Build {
   
   execute(retries, code, cb) {
     if(2 >= retries) {
-      const childProcess = ChildProcess.fork(require.resolve('./child-client-bundle.js'), [JSON.stringify([this.appName, this.name, this.silent, this.bundleName, this.source, this.dest, this.ignores, this.externals, this.externalGlobs, this.exports, this.exportSource, this.shim, process.env.NODE_ENV, this.buildEnv])], {execArgv: []});
+      const childProcess = ChildProcess.fork(require.resolve('./child-client-bundle.js'), [JSON.stringify([this.appName, this.folderName, this.name, this.silent, this.bundleName, this.source, this.dest, this.ignores, this.maps, this.exports, this.allowRequire, this.entryFiles, this.externalsGlobMap, this.externalsMap, process.env.NODE_ENV, this.buildEnv])], {execArgv: []});
       let done = false;
       childProcess.on('exit', (code) => {
         if(!done) {

package/project/server/build-client-js.js

@@ -1,5 +1,5 @@
 
-'use strict';
+// SPDX-License-Identifier: MIT; Copyright (c) 2026 Hagnell Konsulting AB
 
 const Build = require('./build');
 const Log = require('./log');
@@ -9,10 +9,11 @@ const Clc = require('cli-color');
 
 
 class BuildClientJs extends Build {
-  constructor(appName, layer, part, source, dest) {
-    super(appName, `Client:${layer}Layer/${part}`, __filename, source, dest);
+  constructor(appName, folderName, layer, part, source, dest) {
+    super(appName, folderName, `Client:${layer}Layer/${part}`, __filename, source, dest);
     this.layer = layer;
     this.part = part;
+    this.destFolder = 'App' === this.layer ? `${layer}Layer-${part}` : '';
   }
   
   saveData() {
@@ -30,7 +31,7 @@ class BuildClientJs extends Build {
   
   execute(retries, code, cb) {
     if(2 >= retries) {
-      const childProcess = ChildProcess.fork(require.resolve('./child-client-js.js'), [JSON.stringify([this.appName, this.name, this.silent, this.repo, this.source, this.dest, process.env.NODE_ENV])], {execArgv: []});
+      const childProcess = ChildProcess.fork(require.resolve('./child-client-js.js'), [JSON.stringify([this.appName, this.folderName, this.name, this.silent, this.repo, this.source, this.dest, this.destFolder, process.env.NODE_ENV])], {execArgv: []});
       let done = false;
       childProcess.on('exit', (code) => {
         if(!done) {
@@ -55,4 +56,5 @@ class BuildClientJs extends Build {
   }
 }
 
+
 module.exports = BuildClientJs;

package/project/server/build-client-jsx.js

@@ -1,5 +1,5 @@
 
-'use strict';
+// SPDX-License-Identifier: MIT; Copyright (c) 2026 Hagnell Konsulting AB
 
 const Build = require('./build');
 const Log = require('./log');
@@ -9,11 +9,12 @@ const Clc = require('cli-color');
 
 
 class BuildClientJsx extends Build {
-  constructor(appName, layer, part, source, dest) {
-    super(appName, `Client:${layer}Layer/${part}-jsx`, __filename, source, dest);
+  constructor(appName, folderName, layer, part, source, dest) {
+    super(appName, folderName, `Client:${layer}Layer/${part}-jsx`, __filename, source, dest);
     this.layer = layer;
     this.part = part;
     this.dest = dest;
+    this.destFolder = 'App' === this.layer ? `${layer}Layer-${part}` : '';
   }
   
   saveData() {
@@ -31,7 +32,7 @@ class BuildClientJsx extends Build {
   
   execute(retries, code, cb) {
     if(2 >= retries) {
-      const childProcess = ChildProcess.fork(require.resolve('./child-client-jsx.js'), [JSON.stringify([this.appName, this.name, this.silent, this.repo, this.source, this.dest, process.env.NODE_ENV])], {execArgv: []});
+      const childProcess = ChildProcess.fork(require.resolve('./child-client-jsx.js'), [JSON.stringify([this.appName, this.folderName, this.name, this.silent, this.repo, this.source, this.dest, this.destFolder, process.env.NODE_ENV])], {execArgv: []});
       let done = false;
       childProcess.on('exit', (code) => {
         if(!done) {

package/project/server/build-client-rc-bundle.js

@@ -1,5 +1,5 @@
 
-'use strict';
+// SPDX-License-Identifier: MIT; Copyright (c) 2026 Hagnell Konsulting AB
 
 const Build = require('./build');
 const Log = require('./log');
@@ -9,8 +9,8 @@ const Fs = require('fs');
 
 
 class BuildClientRcBundle extends Build {
-  constructor(appName, part, source, dest, remove) {
-    super(appName, `client-css-${part}-bundle`, __filename, source, dest);
+  constructor(appName, folderName, part, source, dest, remove) {
+    super(appName, folderName, `client-css-${part}-bundle`, __filename, source, dest);
     this.part = part;
     this.remove = remove;
     this.bundleName = `bundle-${part}.css`;
@@ -44,7 +44,7 @@ class BuildClientRcBundle extends Build {
   
   execute(retries, code, cb) {
     if(2 >= retries) {
-      const childProcess = ChildProcess.fork(require.resolve('./child-client-rc-bundle.js'), [JSON.stringify([this.appName, this.name, this.silent, this.bundleName, this.repo, this.source, this.dest, this.remove, process.env.NODE_ENV, this.buildEnv])], {execArgv: []});
+      const childProcess = ChildProcess.fork(require.resolve('./child-client-rc-bundle.js'), [JSON.stringify([this.appName, this.folderName, this.name, this.silent, this.bundleName, this.repo, this.source, this.dest, this.remove, process.env.NODE_ENV, this.buildEnv])], {execArgv: []});
       let done = false;
       childProcess.on('exit', (code) => {
         if(!done) {

package/project/server/build-server-js.js

@@ -1,5 +1,5 @@
 
-'use strict';
+// SPDX-License-Identifier: MIT; Copyright (c) 2026 Hagnell Konsulting AB
 
 const Build = require('./build');
 const Log = require('./log');
@@ -9,8 +9,8 @@ const Clc = require('cli-color');
 
 
 class BuildServerJs extends Build {
-  constructor(appName, layer, part, source, dest, replaceCondition, replaceHandle) {
-    super(appName, `Server:${layer}Layer/${part}`, __filename, source, dest);
+  constructor(appName, folderName, layer, part, source, dest, replaceCondition, replaceHandle) {
+    super(appName, folderName, `Server:${layer}Layer/${part}`, __filename, source, dest);
     this.layer = layer;
     this.part = part;
     this.replaceCondition = replaceCondition ? (new RegExp(replaceCondition)).source : null;
@@ -34,7 +34,7 @@ class BuildServerJs extends Build {
   
   execute(retries, code, cb) {
     if(2 >= retries) {
-      const childProcess = ChildProcess.fork(require.resolve('./child-server-js.js'), [JSON.stringify([this.appName, this.name, this.silent, this.repo, this.source, this.dest, process.env.NODE_ENV, this.replaceCondition, this.replaceHandle])], {execArgv: []});
+      const childProcess = ChildProcess.fork(require.resolve('./child-server-js.js'), [JSON.stringify([this.appName, this.folderName, this.name, this.silent, this.repo, this.source, this.dest, process.env.NODE_ENV, this.replaceCondition, this.replaceHandle])], {execArgv: []});
       let done = false;
       childProcess.on('exit', (code) => {
         if(!done) {
@@ -59,4 +59,5 @@ class BuildServerJs extends Build {
   }
 }
 
+
 module.exports = BuildServerJs;

package/project/server/build-server-rc.js

@@ -1,5 +1,5 @@
 
-'use strict';
+// SPDX-License-Identifier: MIT; Copyright (c) 2026 Hagnell Konsulting AB
 
 const Build = require('./build');
 const Log = require('./log');
@@ -9,8 +9,8 @@ const Fs = require('fs');
 
 
 class BuildServerRc extends Build {
-  constructor(appName, part, source, dest) {
-    super(appName, `server-${part}-rc`, __filename, source, dest);
+  constructor(appName, folderName, part, source, dest) {
+    super(appName, folderName, `server-${part}-rc`, __filename, source, dest);
     this.part = part;
   }
   
@@ -40,7 +40,7 @@ class BuildServerRc extends Build {
   
   execute(retries, code, cb) {
     if(2 >= retries) {
-      const childProcess = ChildProcess.fork(require.resolve('./child-server-rc.js'), [JSON.stringify([this.appName, this.name, this.silent, this.repo, this.source, this.dest, process.env.NODE_ENV])], {execArgv: []});
+      const childProcess = ChildProcess.fork(require.resolve('./child-server-rc.js'), [JSON.stringify([this.appName, this.folderName, this.name, this.silent, this.repo, this.source, this.dest, process.env.NODE_ENV])], {execArgv: []});
       let done = false;
       childProcess.on('exit', (code) => {
         if(!done) {

package/project/server/build.js

@@ -1,5 +1,5 @@
 
-'use strict';
+// SPDX-License-Identifier: MIT; Copyright (c) 2026 Hagnell Konsulting AB
 
 const Log = require('./log');
 const Clc = require('cli-color');
@@ -11,10 +11,19 @@ const Path = require('path');
 class Build {
   static runningTasks = 0;
   static initialBuild = true;
-
-  constructor(appName, name, fileName, source, dest) {
+  static BUNDLE_TYPE_CLIENT = 0;
+  static BUNDLE_TYPE_CS = 1;
+  static BUNDLE_TYPE_TEXT = [
+    'client',
+    'clientServer'
+  ];
+  static URL_PATH = 'abs-scripts';
+  static bundleFiles = new Map();
+  
+  constructor(appName, folderName, name, fileName, source, dest) {
     this.bottleneckQueue = null;
     this.appName = appName;
+    this.folderName = folderName;
     this.name = name;
     this.fileName = name.replace(/[/\\?%*:|"<>]/g, '-');
     this.requireName = fileName.substring(__dirname.length + 1, fileName.length - '.js'.length);
@@ -86,7 +95,6 @@ class Build {
       }
     }
     if(Array.isArray(this.rawSource)) {
-      console.log('OLD:', this.name, this.rawSource);
       this.rawSource.forEach((src) => {
         if('object' === typeof src) {
           this.source.push(this._formatSource(organization, src.path) + src.filter);
@@ -100,7 +108,6 @@ class Build {
       this.addSourceFromObject(organization);
     }
     else if('string' === typeof this.rawSource) {
-      console.log('OLD:', this.name, this.rawSource);
       this.addSourceFromString(organization);
     }
   }
@@ -115,7 +122,135 @@ class Build {
     }
   }
   
-  static load(appName, fileName, requireName, bottleneckQueue, cb) {
+  static findClientBld(clientBldPath, clientBldType, cb) {
+    if(null === clientBldPath) {
+      return process.nextTick(cb, null);
+    }
+    Fs.readdir(clientBldPath, (err, files) => {
+      let foundBld = null;
+      if(err) {
+        cb(foundBld);
+	   	}
+      else {
+        let pendings = files.length;
+        let pattern = Build.BUNDLE_TYPE_CLIENT === clientBldType ? /^Bundle-.*-client\.bld$/ : /^Bundle-.*-cs\.bld$/;
+        for(let i=0 ; i < files.length; ++i) {
+          const f = files[i];
+          if(pattern.test(f)) {
+            foundBld = `${clientBldPath}${Path.sep}${f}`;
+            process.nextTick(cb, foundBld);
+            break;
+          }
+          if(0 === --pendings) {
+            process.nextTick(cb, foundBld);
+          }
+        }
+      }
+	  });
+  }
+    
+  static getDependencyData(bundleFileName, cb) {
+    if(null === bundleFileName) {
+      return cb(null);
+    }
+    let bundleFileData = this.bundleFiles.get(bundleFileName);
+    if(bundleFileData) {
+      if(bundleFileData.bundle) {
+        process.nextTick((bundle, cb) => {
+          cb(`Client:${bundle.layer}Layer/${bundle.part}`, bundle.source.path, bundle.exports, `${bundle.layer}Layer-${bundle.part}`);
+        }, bundleFileData.bundle, cb);
+      }
+      else {
+        bundleFileData.cbs.push(cb);
+      }
+    }
+    else {
+      bundleFileData = {
+        cbs: [],
+        bundle: null
+      };
+      this.bundleFiles.set(bundleFileName, bundleFileData);
+      Fs.readFile(bundleFileName, (err, data) => {
+        if(err) {
+          cb(null);
+        }
+        else {
+          let bundle = null;
+          try {
+            bundle = JSON.parse(data);
+            bundleFileData.bundle = bundle;
+          }
+          catch(e) {
+            return cb(null);
+          }
+          bundleFileData.cbs.forEach((cb) => {
+            process.nextTick((bundleFileData) => {
+              cb(`Client:${bundle.layer}Layer/${bundle.part}`, bundle.source.path, bundle.exports, `${bundle.layer}Layer-${bundle.part}`);
+            }, bundleFileData);
+          });
+          cb(`Client:${bundle.layer}Layer/${bundle.part}`, bundle.source.path, bundle.exports, `${bundle.layer}Layer-${bundle.part}`);
+        }
+      });
+    }
+  }
+  
+  static createBuild(requireName, appName, folderName, dataObject, parameters, bottleneckQueue, dependencyNames, entryFiles, externalsGlobMap, externalsMap, cb) {
+    let build = null;
+    try {
+      const B = require(`.${Path.sep}` + requireName);
+      build = new B(appName, folderName, ...parameters, entryFiles, externalsGlobMap, externalsMap);
+      build.setBottleneckQueue(bottleneckQueue);
+      build.isBundle = undefined !== dataObject._bundle ? dataObject._bundle : false;
+    }
+    catch(e) {
+      return cb(e); 
+    } 
+    cb(null, build, dependencyNames);
+  }
+  
+  static addDependencyData(isCurrentFolder, dependency, part, dependencyNames, exportsSet, externalsGlobMap, externalsMap, dependencyMap, cb) {
+    let clientBldFile;
+    let clientBldType;
+    if('AppLayer-client' === dependency) {
+      clientBldFile = `.${Path.sep}workspace`;
+      clientBldType = Build.BUNDLE_TYPE_CLIENT;
+    }
+    else if('AppLayer-cs' === dependency) {
+      clientBldFile = `.${Path.sep}workspace`;
+      clientBldType = Build.BUNDLE_TYPE_CS;
+    }
+    else {
+      clientBldFile = `..${Path.sep}${dependency}${Path.sep}project${Path.sep}${Build.BUNDLE_TYPE_TEXT[part]}${Path.sep}_build`;
+      clientBldType = part;
+    }
+    Build.findClientBld(clientBldFile, clientBldType, (foundBld) => {
+      if(foundBld) {
+        Build.getDependencyData(foundBld, (dependencyName, externalSourcePath, externals, bundleName) => {
+          dependencyMap.set(dependency, bundleName);
+          const externalsGlob = `${externalSourcePath}/**/*.js`;
+          if(dependencyName) {
+            dependencyNames.add(dependencyName);
+          }
+          if(!isCurrentFolder) {
+            if(externalsGlob) {
+              externalsGlobMap.set(externalsGlob, bundleName);
+            }
+            if(0 !== externals.length) {
+              for (const item of externals) {
+                externalsMap.set(item, bundleName);
+              }
+            }
+          }
+          cb();
+        });
+      }
+      else {
+        cb();
+      }
+    });
+  }
+  
+  static load(appName, folderName, fileName, requireName, bottleneckQueue, cb) {
     Fs.readFile(fileName, (err, data) => {
       if(err) {
         return cb(err);
@@ -123,22 +258,64 @@ class Build {
       const dataObject = Build.parseFile(data, fileName);
       const keys = Reflect.ownKeys(dataObject);
       const parameters = [];
-      let dependencyNames = [];
+      const parametersNames = [];
+	    let dependencyNames = new Set();
+      const externalsGlobMap = new Map();
+      const externalsMap = new Map();
+      const dependencyMap = new Map();
+      let exports = [];
+      const exportsSet = new Set();
       keys.forEach((key) => {
-        if('dependencyNames' !== key) {
-          if(!key.startsWith('_')) {
-            parameters.push(Reflect.get(dataObject, key));
+        if('dependencies' !== key) {
+          if('dependencyNames' !== key) {
+            if(!key.startsWith('_')) {
+              parameters.push(Reflect.get(dataObject, key));
+              parametersNames.push(key);
+              if('exports' === key) {
+                exports = Reflect.get(dataObject, key);
+              }
+            }
+          }
+          else {
+            for(const item of Reflect.get(dataObject, key)) {
+              dependencyNames.add(item);
+            }
           }
         }
+      });
+      if(dataObject._bundle) {
+        if(dataObject.dependencies && 0 !== dataObject.dependencies.length) {
+          let pendings = dataObject.dependencies.length;
+          Build.p += pendings;
+          dataObject.dependencies.forEach((dependency) => {
+            Build.addDependencyData(dependency[0] === folderName, dependency[0], 'cs' === dependency[1] ? Build.BUNDLE_TYPE_CS : Build.BUNDLE_TYPE_CLIENT, dependencyNames, exportsSet, externalsGlobMap, externalsMap, dependencyMap, () => {
+              if(0 === --pendings) {
+                const appDependencies = folderName === 'AppLayer-client' ? dataObject.dependencies.map(d=>d[0]).reverse() : null;
+                const entryFiles = [];
+                if(appDependencies) {
+                  appDependencies.forEach((dependency) => {
+                    entryFiles.push(dependencyMap.get(dependency));
+                  });
+                }
+                Build.createBuild(requireName, appName, folderName, dataObject, parameters, bottleneckQueue, Array.from(dependencyNames), entryFiles, externalsGlobMap, externalsMap, (err, build) => {
+                  cb(err, build, Array.from(dependencyNames));
+                });
+              }
+            });
+          });
+          return;
+        }
         else {
-          dependencyNames = Reflect.get(dataObject, key);
+          Build.createBuild(requireName, appName, folderName, dataObject, parameters, bottleneckQueue, Array.from(dependencyNames), null,  externalsGlobMap, externalsMap, (err, build) => {
+            cb(err, build, Array.from(dependencyNames));
+          });
         }
-      });
-      const B = require(`.${Path.sep}` + requireName);
-      const build = new B(appName, ...parameters);
-      build.setBottleneckQueue(bottleneckQueue);
-      build.isBundle = undefined !== dataObject._bundle ? dataObject._bundle : false;
-      cb(err, build, dependencyNames);
+      }
+      else {
+        Build.createBuild(requireName, appName, folderName, dataObject, parameters, bottleneckQueue, Array.from(dependencyNames), null,  externalsGlobMap, externalsMap, (err, build) => {
+          cb(err, build, Array.from(dependencyNames));
+        });
+      }
     });
   }
   

package/project/server/child-build-data.js

@@ -1,5 +1,5 @@
 
-'use strict';
+// SPDX-License-Identifier: MIT; Copyright (c) 2026 Hagnell Konsulting AB
 
 const Log = require('./log');
 const TaskRunnerGlob = require('./task-runner-glob');