@intelligentgraphics/ig.gfx.packager 2.3.2 → 2.3.4

package/build/index.js

@@ -3864,6 +3864,8 @@ var _igTools = __webpack_require__(/*! @intelligentgraphics/ig.tools.core */ "..
 
 var path = _interopRequireWildcard(__webpack_require__(/*! path */ "path"));
 
+var _simpleGit = __webpack_require__(/*! simple-git */ "simple-git");
+
 var fs = _interopRequireWildcard(__webpack_require__(/*! fs-extra */ "fs-extra"));
 
 var _util = __webpack_require__(/*! ../util */ "./src/util.ts");
@@ -3915,6 +3917,9 @@ const releaseFolder = async (folderPath, options) => {
   } = (0, _util.parsePackageDomains)(fullPackageName);
   const publishDomain = (_options$domain = options.domain) !== null && _options$domain !== void 0 ? _options$domain : domain;
   const publishSubdomain = (_options$subdomain = options.subdomain) !== null && _options$subdomain !== void 0 ? _options$subdomain : subdomain;
+  const sharedPackageJson = await fs.readFile(path.join(process.cwd(), "package.json"), {
+    encoding: "utf8"
+  }).then(JSON.parse).catch(() => undefined);
   let newVersion;
 
   try {
@@ -3935,11 +3940,44 @@ const releaseFolder = async (folderPath, options) => {
     };
   }
 
+  const gitVersionInformation = await getVersionInformationFromGit(folderPath, options.cwd);
+
   if (!options.pushOnly) {
+    var _sharedPackageJson$pa;
+
     writeVersionFile(fullPackageName, newVersion);
+    let bannerText = sharedPackageJson === null || sharedPackageJson === void 0 ? void 0 : (_sharedPackageJson$pa = sharedPackageJson.packager) === null || _sharedPackageJson$pa === void 0 ? void 0 : _sharedPackageJson$pa.banner;
+
+    if (bannerText) {
+      const match = bannerText.match(/Copyright \(C\) (\d+)( ?- ?(\d+))?/);
+
+      if (match !== null) {
+        const startYear = parseInt(match[1]);
+        const endYear = new Date().getFullYear();
+
+        if (startYear !== endYear) {
+          bannerText = bannerText.replace(match[0], `Copyright (C) ${startYear} - ${endYear}`);
+        } else {
+          bannerText = bannerText.replace(match[0], `Copyright (C) ${startYear}`);
+        }
+      }
+    }
+
     await (0, _build.buildFolders)(_objectSpread(_objectSpread({}, options), {}, {
       directories: [folderPath],
-      skipPackagesWithoutTsFiles: true
+      skipPackagesWithoutTsFiles: true,
+      banner: options.banner ? {
+        text: bannerText,
+        commit: gitVersionInformation.commit,
+        commitDirty: gitVersionInformation.dirty,
+        version: newVersion.toVersionString({
+          buildNumber: true
+        }),
+        date: new Date(Date.now()) //  gitVersionInformation.commitDate
+        // 	? new Date(gitVersionInformation.commitDate)
+        // 	: new Date(Date.now()),
+
+      } : undefined
     }));
   }
 
@@ -4109,6 +4147,39 @@ const parseVersion = input => {
   return new _igTools.PackageVersion(parseInt(major), parseInt(minor), parseInt(patch), preRelease, buildNumber);
 };
 
+const getVersionInformationFromGit = async (packageDir, gitDir) => {
+  try {
+    var _log$latest, _log$latest2;
+
+    const git = (0, _simpleGit.simpleGit)({
+      baseDir: gitDir
+    }); // check wether the files for a folder are changed
+    // if so, mark as dirty
+
+    const diff = await git.diffSummary();
+    const dirty = diff.files.some(file => {
+      if (file.file.toLowerCase().includes("releases") || file.file.toLowerCase().endsWith("version.ts")) {
+        return false;
+      }
+
+      const fullPath = path.resolve(gitDir, file.file);
+      const relativePath = path.relative(packageDir, fullPath);
+      return !relativePath.startsWith("..");
+    });
+    const log = await git.log({
+      maxCount: 1
+    });
+    const commit = !((_log$latest = log.latest) !== null && _log$latest !== void 0 && _log$latest.hash) ? undefined : log.latest.hash.substring(0, 7);
+    return {
+      commit,
+      dirty,
+      commitDate: (_log$latest2 = log.latest) === null || _log$latest2 === void 0 ? void 0 : _log$latest2.date
+    };
+  } catch (err) {
+    return {};
+  }
+};
+
 /***/ }),
 
 /***/ "./src/docs.ts":
@@ -4415,16 +4486,9 @@ Packaging without a javascript file is only allowed when animation json files ar
   }
 
   if (animations.size > 0) {
-    const [scriptDomain, scriptSubdomain] = data.Scope.split(".");
-    const scope = `${scriptDomain}.${scriptSubdomain}`;
-    library += `
-				var ${scriptDomain};
-				(function (${scriptDomain}) {
-					var ${scriptSubdomain};
-					(function (${scriptSubdomain}) {
-					})(${scriptSubdomain} = ${scriptDomain}.${scriptSubdomain} || (${scriptDomain}.${scriptSubdomain} = {}));
-				})(${scriptDomain} || (${scriptDomain} = {}));
-			`;
+    const scopeParts = data.Scope.split(".");
+    const scope = data.Scope;
+    library += createNamespace(scopeParts);
 
     for (const [name, data] of animations) {
       library += `${scope}.${name} = ` + data + ";";
@@ -4472,6 +4536,17 @@ Packaging without a javascript file is only allowed when animation json files ar
   await pipeline(archive.generateNodeStream(), zipOutputStream);
 };
 
+const createNamespace = parts => {
+  let code = `var ${parts[0]};`;
+
+  for (let index = 0; index < parts.length; index++) {
+    const path = parts.slice(0, index + 1).join(".");
+    code += `\n(${path} = ${path} || {});`;
+  }
+
+  return code;
+};
+
 const uploadArchive = async ({
   domain,
   subdomain,
@@ -4648,8 +4723,45 @@ const build = async (folderPath, options) => {
 
   host.writeFile = (fileName, data, writeByteOrderMark) => {
     if (options.banner) {
-      data = `/*${options.banner}*/
+      const details = [];
+
+      if (options.banner.version) {
+        details.push(`Version: ${options.banner.version}`);
+      }
+
+      if (options.banner.commit) {
+        if (options.banner.commitDirty) {
+          details.push(`Commit: ${options.banner.commit} (dirty)`);
+        } else {
+          details.push(`Commit: ${options.banner.commit}`);
+        }
+      }
+
+      if (options.banner.date) {
+        details.push(`Date: ${options.banner.date.toISOString()}`);
+      }
+
+      const detailsText = details.map(line => ` * ${line}`).join("\n");
+      const bannerParts = [];
+
+      if (options.banner.text) {
+        bannerParts.push(" * " + options.banner.text);
+      }
+
+      if (detailsText) {
+        bannerParts.push(detailsText);
+      }
+
+      const bannerText = bannerParts.join("\n\n");
+
+      if (bannerText) {
+        data = `/*
+${bannerText}
+ *
+ * @preserve			
+ */
 ${data}`;
+      }
     }
 
     const {
@@ -8170,6 +8282,17 @@ module.exports = require("rimraf");
 
 /***/ }),
 
+/***/ "simple-git":
+/*!*****************************!*\
+  !*** external "simple-git" ***!
+  \*****************************/
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("simple-git");
+
+/***/ }),
+
 /***/ "source-map-support":
 /*!*************************************!*\
   !*** external "source-map-support" ***!
@@ -8342,7 +8465,7 @@ module.exports = require("util");
 /***/ ((module) => {
 
 "use strict";
-module.exports = JSON.parse('{"name":"@intelligentgraphics/ig.gfx.packager","version":"2.3.2","description":"IG.GFX.Packager 2.3.2 (2.3.2.100)","author":"Michael Beier <mb@intelligentgraphics.biz>","main":"build/index.js","private":false,"publishConfig":{"access":"public"},"engines":{"node":">=14.0.0"},"bin":{"packager":"./build/index.js"},"files":["build","locales","scripts"],"scripts":{"dist":"webpack","clean":"rimraf build *.tsbuildinfo","prepublishOnly":"yarn clean && yarn dist","test":"jest","_postinstall":"node scripts/postinstall.js","format":"prettier --write \\"**/*.{ts,tsx,json}\\""},"dependencies":{"ajv":"^8.6.2","axios":"^0.21.1","core-js":"^3.16.0","execa":"^5.1.1","fs-extra":"^10.0.0","glob":"^7.1.4","jszip":"^3.10.0","rimraf":"^3.0.2","source-map-support":"^0.5.19","terser":"^4.8.0","typedoc":"~0.23.2","typescript":"~4.7.4","update-notifier":"^5.1.0","v8-compile-cache":"^2.1.1","y18n":"^5.0.8","yargs":"^17.0.1"},"devDependencies":{"@babel/plugin-proposal-class-properties":"^7.18.6","@babel/plugin-proposal-object-rest-spread":"^7.18.9","@babel/preset-env":"^7.18.9","@intelligentgraphics/ig.tools.core":"^1.5.2","@intelligentgraphics/ig.utilities":"^1.6.6","@types/fs-extra":"^9.0.12","@types/glob":"^7.1.4","@types/node":"^16.4.11","@types/rimraf":"^3.0.1","@types/update-notifier":"^5.1.0","@types/yargs":"^17.0.2","babel-loader":"^8.1.0","ts-loader":"^9.2.5","ts-node":"^10.1.0","webpack":"^5.64.4","webpack-cli":"^4.7.2"}}');
+module.exports = JSON.parse('{"name":"@intelligentgraphics/ig.gfx.packager","version":"2.3.4","description":"IG.GFX.Packager 2.3.4 (2.3.4.100)","author":"Michael Beier <mb@intelligentgraphics.biz>","main":"build/index.js","private":false,"publishConfig":{"access":"public"},"engines":{"node":">=14.0.0"},"bin":{"packager":"./build/index.js"},"files":["build","locales","scripts"],"scripts":{"dist":"webpack","clean":"rimraf build *.tsbuildinfo","prepublishOnly":"yarn clean && yarn dist","test":"jest","_postinstall":"node scripts/postinstall.js","format":"prettier --write \\"**/*.{ts,tsx,json}\\""},"dependencies":{"ajv":"^8.6.2","axios":"^0.21.1","core-js":"^3.16.0","execa":"^5.1.1","fs-extra":"^10.0.0","glob":"^7.1.4","jszip":"^3.10.0","rimraf":"^3.0.2","simple-git":"^3.15.1","source-map-support":"^0.5.19","terser":"^4.8.0","typedoc":"~0.23.2","typescript":"~4.7.4","update-notifier":"^5.1.0","v8-compile-cache":"^2.1.1","y18n":"^5.0.8","yargs":"^17.0.1"},"devDependencies":{"@babel/plugin-proposal-class-properties":"^7.18.6","@babel/plugin-proposal-object-rest-spread":"^7.18.9","@babel/preset-env":"^7.18.9","@intelligentgraphics/ig.tools.core":"^1.5.2","@intelligentgraphics/ig.utilities":"^1.6.6","@types/fs-extra":"^9.0.12","@types/glob":"^7.1.4","@types/node":"^16.4.11","@types/rimraf":"^3.0.1","@types/update-notifier":"^5.1.0","@types/yargs":"^17.0.2","babel-loader":"^8.1.0","ts-loader":"^9.2.5","ts-node":"^10.1.0","webpack":"^5.64.4","webpack-cli":"^4.7.2"}}');
 
 /***/ })
 
@@ -8432,10 +8555,6 @@ const captureError = err => {
 };
 
 const applyBuildOptions = argv => argv.options({
-  banner: {
-    description: (0, _localization.translate)("options.banner.description"),
-    type: "string"
-  },
   outDir: {
     description: (0, _localization.translate)("options.outDir.description"),
     type: "string",
@@ -8604,7 +8723,8 @@ yargs.command({
     const fullOptions = _objectSpread(_objectSpread({}, options), {}, {
       authentication,
       service: service,
-      directories: [directory]
+      directories: [directory],
+      banner: true
     });
 
     releaseFolders(fullOptions).catch(captureError);