@aj-shadow/z-build-project 0.0.0-aj-beta.262 → 0.0.0-aj-beta.264

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@aj-shadow/z-build-project",
-  "version": "0.0.0-aj-beta.262",
+  "version": "0.0.0-aj-beta.264",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@aj-shadow/z-build-project",
-      "version": "0.0.0-aj-beta.262",
+      "version": "0.0.0-aj-beta.264",
       "license": "MIT"
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aj-shadow/z-build-project",
-  "version": "0.0.0-aj-beta.262",
+  "version": "0.0.0-aj-beta.264",
   "release-step": "delivery",
   "description": "Library used by @actorjs/actorjs",
   "author": "ActorJs",

package/package_release.json

@@ -1,6 +1,6 @@
 {
   "name": "@aj-shadow/z-build-project",
-  "version": "0.0.0-aj-beta.262",
+  "version": "0.0.0-aj-beta.264",
   "release-step": "delivery",
   "description": "Library used by @actorjs/actorjs",
   "author": "ActorJs",

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

@@ -9,7 +9,7 @@ const Fs = require('fs');
 
 
 class BuildClientBundle extends Build {
-  constructor(appName, folderName, layer, part, source, dest, ignores, maps, exports, allowRequire, entryFiles, externalsGlobMap, externalsMap) {
+  constructor(appName, folderName, releaseStep, 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;

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

@@ -9,8 +9,9 @@ const Clc = require('cli-color');
 
 
 class BuildClientJs extends Build {
-  constructor(appName, folderName, layer, part, source, dest) {
+  constructor(appName, folderName, releaseStep, layer, part, source, dest) {
     super(appName, folderName, `Client:${layer}Layer/${part}`, __filename, source, dest);
+    this.releaseStep = releaseStep;
     this.layer = layer;
     this.part = part;
     this.destFolder = 'App' === this.layer ? `${layer}Layer-${part}` : '';
@@ -31,7 +32,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.folderName, this.name, this.silent, this.repo, this.source, this.dest, this.destFolder, process.env.NODE_ENV])], {execArgv: []});
+      const childProcess = ChildProcess.fork(require.resolve('./child-client-js.js'), [JSON.stringify([this.appName, this.folderName, this.releaseStep, 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-jsx.js

@@ -9,7 +9,7 @@ const Clc = require('cli-color');
 
 
 class BuildClientJsx extends Build {
-  constructor(appName, folderName, layer, part, source, dest) {
+  constructor(appName, folderName, releaseStep, layer, part, source, dest) {
     super(appName, folderName, `Client:${layer}Layer/${part}-jsx`, __filename, source, dest);
     this.layer = layer;
     this.part = part;

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

@@ -9,7 +9,7 @@ const Fs = require('fs');
 
 
 class BuildClientRcBundle extends Build {
-  constructor(appName, folderName, part, source, dest, remove) {
+  constructor(appName, folderName, releaseStep, part, source, dest, remove) {
     super(appName, folderName, `client-css-${part}-bundle`, __filename, source, dest);
     this.part = part;
     this.remove = remove;

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

@@ -9,7 +9,7 @@ const Clc = require('cli-color');
 
 
 class BuildServerJs extends Build {
-  constructor(appName, folderName, layer, part, source, dest, replaceCondition, replaceHandle) {
+  constructor(appName, folderName, releaseStep, layer, part, source, dest, replaceCondition, replaceHandle) {
     super(appName, folderName, `Server:${layer}Layer/${part}`, __filename, source, dest);
     this.layer = layer;
     this.part = part;

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

@@ -9,7 +9,7 @@ const Fs = require('fs');
 
 
 class BuildServerRc extends Build {
-  constructor(appName, folderName, part, source, dest) {
+  constructor(appName, folderName, releaseStep, part, source, dest) {
     super(appName, folderName, `server-${part}-rc`, __filename, source, dest);
     this.part = part;
   }

package/project/server/build.js

@@ -194,11 +194,11 @@ class Build {
     }
   }
   
-  static createBuild(requireName, appName, folderName, dataObject, parameters, bottleneckQueue, dependencyNames, entryFiles, externalsGlobMap, externalsMap, cb) {
+  static createBuild(requireName, appName, folderName, releaseStep, 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 = new B(appName, folderName, releaseStep, ...parameters, entryFiles, externalsGlobMap, externalsMap);
       build.setBottleneckQueue(bottleneckQueue);
       build.isBundle = undefined !== dataObject._bundle ? dataObject._bundle : false;
     }
@@ -208,7 +208,7 @@ class Build {
     cb(null, build, dependencyNames);
   }
   
-  static addDependencyData(isCurrentFolder, dependency, part, dependencyNames, exportsSet, externalsGlobMap, externalsMap, dependencyMap, cb) {
+  static addDependencyData(releaseStep, isCurrentFolder, dependency, part, dependencyNames, exportsSet, externalsGlobMap, externalsMap, dependencyMap, cb) {
     let clientBldFile;
     let clientBldType;
     if('AppLayer-client' === dependency) {
@@ -220,7 +220,12 @@ class Build {
       clientBldType = Build.BUNDLE_TYPE_CS;
     }
     else {
-      clientBldFile = `..${Path.sep}${dependency}${Path.sep}project${Path.sep}${Build.BUNDLE_TYPE_TEXT[part]}${Path.sep}_build`;
+      if('delivery' === releaseStep) {
+        clientBldFile = `.${Path.sep}node_modules${Path.sep}@aj-shadow${Path.sep}${dependency}${Path.sep}project${Path.sep}${Build.BUNDLE_TYPE_TEXT[part]}${Path.sep}_build`;
+      }
+      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) => {
@@ -250,7 +255,7 @@ class Build {
     });
   }
   
-  static load(appName, folderName, fileName, requireName, bottleneckQueue, cb) {
+  static load(appName, releaseStep, folderName, fileName, requireName, bottleneckQueue, cb) {
     Fs.readFile(fileName, (err, data) => {
       if(err) {
         return cb(err);
@@ -259,7 +264,7 @@ class Build {
       const keys = Reflect.ownKeys(dataObject);
       const parameters = [];
       const parametersNames = [];
-	    let dependencyNames = new Set();
+      let dependencyNames = new Set();
       const externalsGlobMap = new Map();
       const externalsMap = new Map();
       const dependencyMap = new Map();
@@ -288,7 +293,7 @@ class Build {
           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, () => {
+            Build.addDependencyData(releaseStep, 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 = [];
@@ -297,7 +302,7 @@ class Build {
                     entryFiles.push(dependencyMap.get(dependency));
                   });
                 }
-                Build.createBuild(requireName, appName, folderName, dataObject, parameters, bottleneckQueue, Array.from(dependencyNames), entryFiles, externalsGlobMap, externalsMap, (err, build) => {
+                Build.createBuild(requireName, appName, folderName, releaseStep, dataObject, parameters, bottleneckQueue, Array.from(dependencyNames), entryFiles, externalsGlobMap, externalsMap, (err, build) => {
                   cb(err, build, Array.from(dependencyNames));
                 });
               }
@@ -306,13 +311,13 @@ class Build {
           return;
         }
         else {
-          Build.createBuild(requireName, appName, folderName, dataObject, parameters, bottleneckQueue, Array.from(dependencyNames), null,  externalsGlobMap, externalsMap, (err, build) => {
+          Build.createBuild(requireName, appName, folderName, releaseStep, dataObject, parameters, bottleneckQueue, Array.from(dependencyNames), null,  externalsGlobMap, externalsMap, (err, build) => {
             cb(err, build, Array.from(dependencyNames));
           });
         }
       }
       else {
-        Build.createBuild(requireName, appName, folderName, dataObject, parameters, bottleneckQueue, Array.from(dependencyNames), null,  externalsGlobMap, externalsMap, (err, build) => {
+        Build.createBuild(requireName, appName, folderName, releaseStep, dataObject, parameters, bottleneckQueue, Array.from(dependencyNames), null,  externalsGlobMap, externalsMap, (err, build) => {
           cb(err, build, Array.from(dependencyNames));
         });
       }

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

@@ -13,14 +13,16 @@ const Path = require('path');
 
 
 class ChildClientJs {
-  constructor(appName, folderName, name, silent, repo, source, dest, nodeEnv) {
+  constructor(appName, folderName, releaseStep, name, silent, repo, source, dest, nodeEnv) {
     this.appName = appName;
     this.folderName = folderName;
+    this.releaseStep = releaseStep;
     this.name = name;
     this.silent = silent;
     this.repo = repo;
     this.source = source;
     this.dest = dest;
+    this.releaseStep = releaseStep;
     this.isDebug = 'development' === nodeEnv;
     this.readyFiles = new Map();
     process.env.NODE_ENV = nodeEnv;
@@ -184,10 +186,20 @@ class ChildClientJs {
     const bundleInculde = data.substring(bundleIndex + ChildMacro.SEARCH_start, stopIndex).toString().replaceAll('/', Path.sep);
     let file = null;
     if(bundleInculde.startsWith('.')) {
-      const lastIndex = srcFile.lastIndexOf(Path.sep);
-      let srcBase = buildPath + srcFile.substring(rootPath.length, lastIndex);
-      srcBase = srcBase.replace(Path.sep + 'project' + Path.sep + 'client' + Path.sep, Path.sep + 'client' + Path.sep);
-      file = Path.normalize(srcBase + Path.sep + bundleInculde) + '.js';
+      if('delivery' === this.releaseStep) {
+        const lastSepIndex = srcFile.lastIndexOf(Path.sep);
+        const lastNodeModulesIndex = srcFile.lastIndexOf(ChildClientJs.NODE_MODULES);
+        const secondSepAfterNodeModulesIndex = srcFile.indexOf(Path.sep, lastNodeModulesIndex + ChildClientJs.NODE_MODULES.length + 2);
+        let srcBase = buildPath + srcFile.substring(secondSepAfterNodeModulesIndex, lastSepIndex);
+        srcBase = srcBase.replace(Path.sep + 'project' + Path.sep + 'client' + Path.sep, Path.sep + 'client' + Path.sep);
+        file = Path.normalize(srcBase + Path.sep + bundleInculde) + '.js';
+      }
+      else {
+        const lastSepIndex = srcFile.lastIndexOf(Path.sep);
+        let srcBase = buildPath + srcFile.substring(rootPath.length, lastSepIndex);
+        srcBase = srcBase.replace(Path.sep + 'project' + Path.sep + 'client' + Path.sep, Path.sep + 'client' + Path.sep);
+        file = Path.normalize(srcBase + Path.sep + bundleInculde) + '.js';
+      }
     }
     else {
       const firstIndex = bundleInculde.indexOf(Path.sep);

package/project/server/process.js

@@ -149,7 +149,7 @@ class AbsProcess {
       Tr.task(coreTask, Tr.serial(Tr.parallel(npmInstall, readPackageJson), (cb) => {
         try {
           if(null === workspace) {
-            workspace = new Workspace(appName, appNameShort, settings.name, coreTask, build, dev, organization, bottleneck, silent);
+            workspace = new Workspace(appName, appNameShort, settings.name, coreTask, build, releaseStep, dev, organization, bottleneck, silent);
             releaseData.workspace = workspace;
           }
           workspace.load((err) => {

package/project/server/workspace.js

@@ -13,11 +13,12 @@ const Path = require('path');
 
 
 class Workspace {
-  constructor(appName, appNameShort, name, task, build, dev, organization, bottleneck, silent = false) {
+  constructor(appName, appNameShort, name, task, build, releaseStep, dev, organization, bottleneck, silent = false) {
     this.appName = appName;
     this.appNameShort = appNameShort;
     this.name = name;
     this.task = task;
+    this.releaseStep = releaseStep;
     this.dev = dev;
     this.organization = organization;
     this.build = build;
@@ -125,7 +126,7 @@ class Workspace {
                 if('clientServer' === workspace.type || buildData.type === workspace.type) {
                   ++pendings;
                   const build = projectData.new ? `_build${Path.sep}` : '';
-                  Build.load(this.appName, projectData.name, `${projectBuild.path}${Path.sep}${build}${buildData.fileName}.bld`, buildData.requireName, this.bottleneckQueue, (err, build, dependencyNames) => {
+                  Build.load(this.appName, this.releaseStep, projectData.name, `${projectBuild.path}${Path.sep}${build}${buildData.fileName}.bld`, buildData.requireName, this.bottleneckQueue, (err, build, dependencyNames) => {
                     if(err) {
                       Log.log(Clc.red('Build.load'), Clc.yellow(projectData.name), err);
                     }
@@ -147,7 +148,7 @@ class Workspace {
       });
       workspace.builds.forEach((buildData) => {
         ++pendings;
-        Build.load(this.appName, buildData.fileName.substring(buildData.fileName.indexOf('-') + 1), `.${Path.sep}workspace${Path.sep}${buildData.fileName}.bld`, buildData.requireName, this.bottleneckQueue, (err, build, dependencyNames) => {
+        Build.load(this.appName, this.releaseStep, buildData.fileName.substring(buildData.fileName.indexOf('-') + 1), `.${Path.sep}workspace${Path.sep}${buildData.fileName}.bld`, buildData.requireName, this.bottleneckQueue, (err, build, dependencyNames) => {
           if(err) {
             return Log.log(err);
           }

package/project/server/new 1.txt

@@ -1,4 +0,0 @@
- 1281689 1281509 906272 906260 264113
- 
- AppLayer-client.js  **** 1071812 1071812 771887 771887 105574
- CompLayer-Codemirror-client.js  **** 1281689 1281689 906440 906440 264153